1992-02-28 19:53:39 +01:00
|
|
|
|
/* Build expressions with type checking for C compiler.
|
c-common.c (decl_attributes): Set DECL_SIZE_UNIT.
* c-common.c (decl_attributes): Set DECL_SIZE_UNIT.
* c-decl.c (duplicate_decls, finish_enum): Likewise.
(finish_decl): Remove -Wlarger-than code from here.
* flags.h (id_clash_len): Now int.
(larger_than_size): Now HOST_WIDE_INT.
* fold-const.c (size_int_wide): No more HIGH parm; NUMBER is signed.
Clean up checking to see if in table.
(make_bit_field_ref): Remove extra parm to bitsize_int.
* ggc-common.c (ggc_mark_tree_children): Mark DECL_SIZE_UNIT.
* print-tree.c (print_node): Print DECL_SIZE_UNIT and TYPE_SIZE_UNIT.
* stmt.c (expand_decl): Use DECL_SIZE_UNIT for stack checking size
and for computing size of decl.
* stor-layout.c (layout_decl): Set DECL_SIZE_UNIT.
Move -Wlarger-than code to here.
(layout_record): Remove extra arg to bitsize_int.
Set TYPE_BINFO_SIZE_UNIT.
(layout_union): Remove extra arg to bitsize_int.
Use proper type for size of QUAL_UNION.
(layout_type): Remove extra arg to bitsize_int.
* toplev.c (id_clash_len): Now int.
(larger_than_size): Now HOST_WIDE_INT.
(decode_W_option): Clean up id-clash and larger-than- cases.
* tree.c (get_identifier, maybe_get_identifier): Remove unneeded casts.
(expr_align, case FUNCTION_DECL): DECL_ALIGN is not defined.
* tree.h (BINFO_SIZE_UNIT, TYPE_BINFO_SIZE_UNIT, DECL_SIZE_UNIT): New.
(struct tree_decl): New field size_unit.
(size_int_wide): No HIGH operand; NUMBER is now signed.
(size_int_2): Deleted.
(size_int, bitsize_int): Don't use it and rework args.
* varasm.c (assemble_variable, output_constructor): Use DECL_SIZE_UNIT.
* ch/decl.c (layout_enum): Set DECL_SIZE_UNIT.
* ch/satisfy.c (safe_satisfy_decl): Likewise.
* cp/class.c (build_primary_vtable, layout_vtable_decl): Likewise.
(avoid_overlap, build_base_field): Likewise.
(build_base_field, build_base_fields, is_empty_class):
Test DECL_SIZE with integer_zero.
(layout_class_type): Set CLASSTYPE_SIZE_UNIT.
* cp/cp-tree.h (struct lang_type): New field size_unit.
(CLASSTYPE_SIZE_UNIT): New macro.
* cp/decl.c (init_decl_processing): Set DECL_SIZE_UNIT.
(cp_finish_decl): Delete -Wlarger-than processing.
* cp/optimize.c (remap_decl): Walk DECL_SIZE_UNIT.
* cp/pt.c (tsubst_decl): Set DECL_SIZE_UNIT.
* cp/tree.c (make_binfo): binfo vector is one entry longer.
(walk_tree): Walk DECL_SIZE_UNIT.
* f/com.c (ffecom_sym_transform): Use DECL_SIZE_UNIT.
(ffecom_transform_common_, ffecom_transform_equiv_): Likewise.
(duplicate_decls): Likewise.
(ffecom_tree_canonize_ptr_): Delete extra arg to bitsize_int.
(finish_decl): Delete -Wlarger-than processing.
* java/class.c (build_class_ref, push_super_field): Set DECL_SIZE_UNIT.
* java/constants.c (build_constants_constructor): Likewise.
From-SVN: r32068
2000-02-20 02:11:00 +01:00
|
|
|
|
Copyright (C) 1987, 1988, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
|
2004-01-02 23:44:27 +01:00
|
|
|
|
1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
Makefile.in, [...]: replace "GNU CC" with "GCC".
* Makefile.in, alias.c, basic-block.h, bb-reorder.c, bitmap.c,
bitmap.h, builtin-types.def, builtins.c, builtins.def,
c-aux-info.c, c-common.c, c-common.def, c-common.h,
c-convert.c, c-decl.c, c-dump.c, c-dump.h, c-errors.c,
c-format.c, c-lang.c, c-lex.c, c-lex.h, c-parse.in,
c-pragma.c, c-pragma.h, c-semantics.c, c-tree.h, c-typeck.c,
caller-save.c, calls.c, collect2.c, collect2.h, combine.c,
conditions.h, config.gcc, configure.frag, configure.in,
conflict.c, convert.c, convert.h, cppspec.c, crtstuff.c,
cse.c, cselib.c, cselib.h, dbxout.c, dbxout.h, defaults.h,
dependence.c, df.c, df.h, diagnostic.c, diagnostic.h,
doloop.c, dominance.c, dwarf.h, dwarf2.h, dwarf2asm.c,
dwarf2asm.h, dwarf2out.c, dwarf2out.h, dwarfout.c,
emit-rtl.c, errors.c, errors.h, except.c, except.h,
exgettext, explow.c, expmed.c, expr.c, expr.h, final.c,
fixproto, flags.h, flow.c, fold-const.c, fp-test.c,
function.c, function.h, gbl-ctors.h, gcc.c, gcc.h, gcc.hlp,
gccspec.c, gcov-io.h, gcse.c, genattr.c, genattrtab.c,
gencheck.c, gencodes.c, genconfig.c, genemit.c,
genextract.c, genflags.c, gengenrtl.c, genmultilib,
genopinit.c, genoutput.c, genpeep.c, genrecog.c,
gensupport.c, gensupport.h, ggc-callbacks.c, ggc-common.c,
ggc-none.c, ggc-page.c, ggc-simple.c, ggc.h, global.c,
graph.c, graph.h, gthr-aix.h, gthr-dce.h, gthr-posix.h,
gthr-rtems.h, gthr-single.h, gthr-solaris.h, gthr-vxworks.h,
gthr-win32.h, gthr.h, haifa-sched.c, halfpic.c, halfpic.h,
hard-reg-set.h, hwint.h, ifcvt.c, input.h, insn-addr.h,
integrate.c, integrate.h, jump.c, lcm.c, libgcc2.c,
libgcc2.h, lists.c, local-alloc.c, loop.c, loop.h,
machmode.def, machmode.h, main.c, mbchar.c, mbchar.h,
mips-tdump.c, mips-tfile.c, mklibgcc.in, mkmap-flat.awk,
mkmap-symver.awk, optabs.c, output.h, params.c, params.def,
params.h, predict.c, predict.def, predict.h, prefix.c,
prefix.h, print-rtl.c, print-tree.c, profile.c, protoize.c,
read-rtl.c, real.c, real.h, recog.c, recog.h, reg-stack.c,
regclass.c, regmove.c, regrename.c, regs.h, reload.c,
reload.h, reload1.c, reorg.c, resource.c, resource.h, rtl.c,
rtl.def, rtl.h, rtlanal.c, sbitmap.c, sbitmap.h,
sched-deps.c, sched-ebb.c, sched-int.h, sched-rgn.c,
sched-vis.c, sdbout.c, sdbout.h, sibcall.c, simplify-rtx.c,
ssa-ccp.c, ssa-dce.c, ssa.c, ssa.h, stmt.c, stor-layout.c,
stringpool.c, system.h, timevar.c, timevar.def, timevar.h,
tlink.c, toplev.c, toplev.h, tree.c, tree.def, tree.h,
tsystem.h, unroll.c, unwind-dw2-fde.c, unwind-dw2-fde.h,
unwind-dw2.c, unwind-pe.h, unwind-sjlj.c, unwind.h,
unwind.inc, varasm.c, varray.c, varray.h, xcoffout.c,
xcoffout.h: replace "GNU CC" with "GCC".
From-SVN: r45105
2001-08-22 16:35:51 +02:00
|
|
|
|
This file is part of GCC.
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
Makefile.in, [...]: replace "GNU CC" with "GCC".
* Makefile.in, alias.c, basic-block.h, bb-reorder.c, bitmap.c,
bitmap.h, builtin-types.def, builtins.c, builtins.def,
c-aux-info.c, c-common.c, c-common.def, c-common.h,
c-convert.c, c-decl.c, c-dump.c, c-dump.h, c-errors.c,
c-format.c, c-lang.c, c-lex.c, c-lex.h, c-parse.in,
c-pragma.c, c-pragma.h, c-semantics.c, c-tree.h, c-typeck.c,
caller-save.c, calls.c, collect2.c, collect2.h, combine.c,
conditions.h, config.gcc, configure.frag, configure.in,
conflict.c, convert.c, convert.h, cppspec.c, crtstuff.c,
cse.c, cselib.c, cselib.h, dbxout.c, dbxout.h, defaults.h,
dependence.c, df.c, df.h, diagnostic.c, diagnostic.h,
doloop.c, dominance.c, dwarf.h, dwarf2.h, dwarf2asm.c,
dwarf2asm.h, dwarf2out.c, dwarf2out.h, dwarfout.c,
emit-rtl.c, errors.c, errors.h, except.c, except.h,
exgettext, explow.c, expmed.c, expr.c, expr.h, final.c,
fixproto, flags.h, flow.c, fold-const.c, fp-test.c,
function.c, function.h, gbl-ctors.h, gcc.c, gcc.h, gcc.hlp,
gccspec.c, gcov-io.h, gcse.c, genattr.c, genattrtab.c,
gencheck.c, gencodes.c, genconfig.c, genemit.c,
genextract.c, genflags.c, gengenrtl.c, genmultilib,
genopinit.c, genoutput.c, genpeep.c, genrecog.c,
gensupport.c, gensupport.h, ggc-callbacks.c, ggc-common.c,
ggc-none.c, ggc-page.c, ggc-simple.c, ggc.h, global.c,
graph.c, graph.h, gthr-aix.h, gthr-dce.h, gthr-posix.h,
gthr-rtems.h, gthr-single.h, gthr-solaris.h, gthr-vxworks.h,
gthr-win32.h, gthr.h, haifa-sched.c, halfpic.c, halfpic.h,
hard-reg-set.h, hwint.h, ifcvt.c, input.h, insn-addr.h,
integrate.c, integrate.h, jump.c, lcm.c, libgcc2.c,
libgcc2.h, lists.c, local-alloc.c, loop.c, loop.h,
machmode.def, machmode.h, main.c, mbchar.c, mbchar.h,
mips-tdump.c, mips-tfile.c, mklibgcc.in, mkmap-flat.awk,
mkmap-symver.awk, optabs.c, output.h, params.c, params.def,
params.h, predict.c, predict.def, predict.h, prefix.c,
prefix.h, print-rtl.c, print-tree.c, profile.c, protoize.c,
read-rtl.c, real.c, real.h, recog.c, recog.h, reg-stack.c,
regclass.c, regmove.c, regrename.c, regs.h, reload.c,
reload.h, reload1.c, reorg.c, resource.c, resource.h, rtl.c,
rtl.def, rtl.h, rtlanal.c, sbitmap.c, sbitmap.h,
sched-deps.c, sched-ebb.c, sched-int.h, sched-rgn.c,
sched-vis.c, sdbout.c, sdbout.h, sibcall.c, simplify-rtx.c,
ssa-ccp.c, ssa-dce.c, ssa.c, ssa.h, stmt.c, stor-layout.c,
stringpool.c, system.h, timevar.c, timevar.def, timevar.h,
tlink.c, toplev.c, toplev.h, tree.c, tree.def, tree.h,
tsystem.h, unroll.c, unwind-dw2-fde.c, unwind-dw2-fde.h,
unwind-dw2.c, unwind-pe.h, unwind-sjlj.c, unwind.h,
unwind.inc, varasm.c, varray.c, varray.h, xcoffout.c,
xcoffout.h: replace "GNU CC" with "GCC".
From-SVN: r45105
2001-08-22 16:35:51 +02:00
|
|
|
|
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 2, or (at your option) any later
|
|
|
|
|
|
version.
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
Makefile.in, [...]: replace "GNU CC" with "GCC".
* Makefile.in, alias.c, basic-block.h, bb-reorder.c, bitmap.c,
bitmap.h, builtin-types.def, builtins.c, builtins.def,
c-aux-info.c, c-common.c, c-common.def, c-common.h,
c-convert.c, c-decl.c, c-dump.c, c-dump.h, c-errors.c,
c-format.c, c-lang.c, c-lex.c, c-lex.h, c-parse.in,
c-pragma.c, c-pragma.h, c-semantics.c, c-tree.h, c-typeck.c,
caller-save.c, calls.c, collect2.c, collect2.h, combine.c,
conditions.h, config.gcc, configure.frag, configure.in,
conflict.c, convert.c, convert.h, cppspec.c, crtstuff.c,
cse.c, cselib.c, cselib.h, dbxout.c, dbxout.h, defaults.h,
dependence.c, df.c, df.h, diagnostic.c, diagnostic.h,
doloop.c, dominance.c, dwarf.h, dwarf2.h, dwarf2asm.c,
dwarf2asm.h, dwarf2out.c, dwarf2out.h, dwarfout.c,
emit-rtl.c, errors.c, errors.h, except.c, except.h,
exgettext, explow.c, expmed.c, expr.c, expr.h, final.c,
fixproto, flags.h, flow.c, fold-const.c, fp-test.c,
function.c, function.h, gbl-ctors.h, gcc.c, gcc.h, gcc.hlp,
gccspec.c, gcov-io.h, gcse.c, genattr.c, genattrtab.c,
gencheck.c, gencodes.c, genconfig.c, genemit.c,
genextract.c, genflags.c, gengenrtl.c, genmultilib,
genopinit.c, genoutput.c, genpeep.c, genrecog.c,
gensupport.c, gensupport.h, ggc-callbacks.c, ggc-common.c,
ggc-none.c, ggc-page.c, ggc-simple.c, ggc.h, global.c,
graph.c, graph.h, gthr-aix.h, gthr-dce.h, gthr-posix.h,
gthr-rtems.h, gthr-single.h, gthr-solaris.h, gthr-vxworks.h,
gthr-win32.h, gthr.h, haifa-sched.c, halfpic.c, halfpic.h,
hard-reg-set.h, hwint.h, ifcvt.c, input.h, insn-addr.h,
integrate.c, integrate.h, jump.c, lcm.c, libgcc2.c,
libgcc2.h, lists.c, local-alloc.c, loop.c, loop.h,
machmode.def, machmode.h, main.c, mbchar.c, mbchar.h,
mips-tdump.c, mips-tfile.c, mklibgcc.in, mkmap-flat.awk,
mkmap-symver.awk, optabs.c, output.h, params.c, params.def,
params.h, predict.c, predict.def, predict.h, prefix.c,
prefix.h, print-rtl.c, print-tree.c, profile.c, protoize.c,
read-rtl.c, real.c, real.h, recog.c, recog.h, reg-stack.c,
regclass.c, regmove.c, regrename.c, regs.h, reload.c,
reload.h, reload1.c, reorg.c, resource.c, resource.h, rtl.c,
rtl.def, rtl.h, rtlanal.c, sbitmap.c, sbitmap.h,
sched-deps.c, sched-ebb.c, sched-int.h, sched-rgn.c,
sched-vis.c, sdbout.c, sdbout.h, sibcall.c, simplify-rtx.c,
ssa-ccp.c, ssa-dce.c, ssa.c, ssa.h, stmt.c, stor-layout.c,
stringpool.c, system.h, timevar.c, timevar.def, timevar.h,
tlink.c, toplev.c, toplev.h, tree.c, tree.def, tree.h,
tsystem.h, unroll.c, unwind-dw2-fde.c, unwind-dw2-fde.h,
unwind-dw2.c, unwind-pe.h, unwind-sjlj.c, unwind.h,
unwind.inc, varasm.c, varray.c, varray.h, xcoffout.c,
xcoffout.h: replace "GNU CC" with "GCC".
From-SVN: r45105
2001-08-22 16:35:51 +02:00
|
|
|
|
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.
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
Makefile.in, [...]: replace "GNU CC" with "GCC".
* Makefile.in, alias.c, basic-block.h, bb-reorder.c, bitmap.c,
bitmap.h, builtin-types.def, builtins.c, builtins.def,
c-aux-info.c, c-common.c, c-common.def, c-common.h,
c-convert.c, c-decl.c, c-dump.c, c-dump.h, c-errors.c,
c-format.c, c-lang.c, c-lex.c, c-lex.h, c-parse.in,
c-pragma.c, c-pragma.h, c-semantics.c, c-tree.h, c-typeck.c,
caller-save.c, calls.c, collect2.c, collect2.h, combine.c,
conditions.h, config.gcc, configure.frag, configure.in,
conflict.c, convert.c, convert.h, cppspec.c, crtstuff.c,
cse.c, cselib.c, cselib.h, dbxout.c, dbxout.h, defaults.h,
dependence.c, df.c, df.h, diagnostic.c, diagnostic.h,
doloop.c, dominance.c, dwarf.h, dwarf2.h, dwarf2asm.c,
dwarf2asm.h, dwarf2out.c, dwarf2out.h, dwarfout.c,
emit-rtl.c, errors.c, errors.h, except.c, except.h,
exgettext, explow.c, expmed.c, expr.c, expr.h, final.c,
fixproto, flags.h, flow.c, fold-const.c, fp-test.c,
function.c, function.h, gbl-ctors.h, gcc.c, gcc.h, gcc.hlp,
gccspec.c, gcov-io.h, gcse.c, genattr.c, genattrtab.c,
gencheck.c, gencodes.c, genconfig.c, genemit.c,
genextract.c, genflags.c, gengenrtl.c, genmultilib,
genopinit.c, genoutput.c, genpeep.c, genrecog.c,
gensupport.c, gensupport.h, ggc-callbacks.c, ggc-common.c,
ggc-none.c, ggc-page.c, ggc-simple.c, ggc.h, global.c,
graph.c, graph.h, gthr-aix.h, gthr-dce.h, gthr-posix.h,
gthr-rtems.h, gthr-single.h, gthr-solaris.h, gthr-vxworks.h,
gthr-win32.h, gthr.h, haifa-sched.c, halfpic.c, halfpic.h,
hard-reg-set.h, hwint.h, ifcvt.c, input.h, insn-addr.h,
integrate.c, integrate.h, jump.c, lcm.c, libgcc2.c,
libgcc2.h, lists.c, local-alloc.c, loop.c, loop.h,
machmode.def, machmode.h, main.c, mbchar.c, mbchar.h,
mips-tdump.c, mips-tfile.c, mklibgcc.in, mkmap-flat.awk,
mkmap-symver.awk, optabs.c, output.h, params.c, params.def,
params.h, predict.c, predict.def, predict.h, prefix.c,
prefix.h, print-rtl.c, print-tree.c, profile.c, protoize.c,
read-rtl.c, real.c, real.h, recog.c, recog.h, reg-stack.c,
regclass.c, regmove.c, regrename.c, regs.h, reload.c,
reload.h, reload1.c, reorg.c, resource.c, resource.h, rtl.c,
rtl.def, rtl.h, rtlanal.c, sbitmap.c, sbitmap.h,
sched-deps.c, sched-ebb.c, sched-int.h, sched-rgn.c,
sched-vis.c, sdbout.c, sdbout.h, sibcall.c, simplify-rtx.c,
ssa-ccp.c, ssa-dce.c, ssa.c, ssa.h, stmt.c, stor-layout.c,
stringpool.c, system.h, timevar.c, timevar.def, timevar.h,
tlink.c, toplev.c, toplev.h, tree.c, tree.def, tree.h,
tsystem.h, unroll.c, unwind-dw2-fde.c, unwind-dw2-fde.h,
unwind-dw2.c, unwind-pe.h, unwind-sjlj.c, unwind.h,
unwind.inc, varasm.c, varray.c, varray.h, xcoffout.c,
xcoffout.h: replace "GNU CC" with "GCC".
From-SVN: r45105
2001-08-22 16:35:51 +02:00
|
|
|
|
along with GCC; see the file COPYING. If not, write to the Free
|
|
|
|
|
|
Software Foundation, 59 Temple Place - Suite 330, Boston, MA
|
|
|
|
|
|
02111-1307, USA. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* This file is part of the C front end.
|
|
|
|
|
|
It contains routines to build C expressions given their operands,
|
|
|
|
|
|
including computing the types of the result, C-specific error checks,
|
2004-06-22 01:30:30 +02:00
|
|
|
|
and some optimization. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
|
|
|
|
|
#include "config.h"
|
Major cutover to using system.h:
* Makefile.in (alias.o, bitmap.o, c-aux-info.o, c-common.o,
c-decl.o, c-iterate.o, c-lang.o, c-lex.o, c-pragma.o, c-typeck.o,
caller-save.o, calls.o, collect2.o, combine.o, cse.o, dbxout.o,
dwarf2out.o, dwarfout.o, emit-rtl.o, except.o, explow.o, expmed.o,
expr.o, final.o, flow.o, function.o, getpwd.o, global.o,
integrate.o, jump.o, local-alloc.o, loop.o, optabs.o, pexecute.o,
prefix.o, print-rtl.o, print-tree.o, profile.o, real.o, recog.o,
reg-stack.o, regclass.o, regmove.o, reload.o, reload1.o, reorg.o,
rtl.o, rtlanal.o, sdbout.o, stmt.o, stor-layout.o, stupid.o,
tlink.o, toplev.o, tree.o, unroll.o, varasm.o, xcoffout.o): Depend
on system.h.
* alias.c, bitmap.c, c-aux-info.c, c-common.c, c-decl.c,
c-iterate.c, c-lang.c, c-lex.c, c-pragma.c, c-typeck.c,
caller-save.c, calls.c, collect2.c, combine.c, cse.c, dbxout.c,
dwarf2out.c, dwarfout.c, emit-rtl.c, except.c, explow.c, expmed.c,
expr.c, final.c, flow.c, function.c, gcc.c, getpwd.c, global.c,
integrate.c, jump.c, local-alloc.c, loop.c, optabs.c, pexecute.c,
prefix.c, print-rtl.c, print-tree.c, profile.c, real.c, recog.c,
reg-stack.c, regclass.c, regmove.c, reload.c, reload1.c, reorg.c,
rtl.c, rtlanal.c, sched.c, sdbout.c, stmt.c, stor-layout.c,
stupid.c, tlink.c, toplev.c, tree.c, unroll.c, varasm.c,
xcoffout.c: Include system.h. Organize include ordering so
that stdarg/varargs comes before other system headers. Remove
spurious casts of functions assured of a prototype in system.h.
From-SVN: r18726
1998-03-20 15:58:42 +01:00
|
|
|
|
#include "system.h"
|
2002-12-16 19:23:00 +01:00
|
|
|
|
#include "coretypes.h"
|
|
|
|
|
|
#include "tm.h"
|
2001-12-31 05:10:19 +01:00
|
|
|
|
#include "rtl.h"
|
1992-02-28 19:53:39 +01:00
|
|
|
|
#include "tree.h"
|
2004-02-03 12:22:41 +01:00
|
|
|
|
#include "langhooks.h"
|
1992-02-28 19:53:39 +01:00
|
|
|
|
#include "c-tree.h"
|
1999-09-20 12:00:03 +02:00
|
|
|
|
#include "tm_p.h"
|
1992-02-28 19:53:39 +01:00
|
|
|
|
#include "flags.h"
|
1994-12-30 13:59:51 +01:00
|
|
|
|
#include "output.h"
|
1998-03-29 13:54:09 +02:00
|
|
|
|
#include "expr.h"
|
toplev.h: New file.
Wed May 6 06:35:38 1998 Robert Lipe <robertl@dgii.com>
* toplev.h: New file. Protypes for functions in toplev.c.
* tree.h, rtl.h: Deleted protos for functions in toplev.c.
* c-common.c, c-convert.c, c-decl.c, c-iterate.c, c-lex.c,
c-parse.in, c-parse.y, c-pragma.c, c-typeck.c, calls.c,
convert.c, dwarf2out.c, except.c, expr.c, final.c, fold-const.c,
function.c, hash.c, profile.c, real.c, reg-stack.c, regclass.c,
reload.c, reload1.c, stmt.c, stor-layout.c, tlink.c, tree.c,
varasm.c: include it.
From-SVN: r19563
1998-05-06 06:45:47 +02:00
|
|
|
|
#include "toplev.h"
|
1999-01-27 02:43:17 +01:00
|
|
|
|
#include "intl.h"
|
c-common.c, [...]: Remove all references to obstack functions obsoleted by GC...
* c-common.c, c-decl.c, c-lang.c, c-lex.c, c-parse.in, c-pragma.c,
c-typeck.c, objc/objc-act.c: Remove all references to obstack
functions obsoleted by GC, such as push_obstacks_nochange,
end_temporary_allocation, savealloc, saveable_tree_cons, etc.
and code which existed only to decide whether or not to call
them. Remove now-unused NESTED argument from start_function;
all callers changed. Do not change behavior based on ggc_p.
The use of the ixp_obstack in c-iterate.c and the util_obstack
in objc/objc-act.c remain; these are not obsoleted by garbage
collection.
* c-tree.h: Update prototype for start_function.
* c-parse.y, c-parse.c, objc/objc-parse.c, objc/objc-parse.y: Rebuild.
From-SVN: r31611
2000-01-25 18:13:14 +01:00
|
|
|
|
#include "ggc.h"
|
Makefile.in (TARGET_H, [...]): New.
* Makefile.in (TARGET_H, TARGET_DEF_H): New.
(c-decl.o, tree.o, c-typeck.o, $(out_object_file)): Update.
* c-decl.c (duplicate_decls): Use function pointer.
* c-typeck.c (common_type): Similarly.
* tree.c (valid_machine_attribute): Similarly.
(merge_machine_type_attributes): Rename merge_type_attributes.
(merge_machine_decl_attributes): Rename merge_decl_attributes.
(merge_dllimport_decl_attributes): New function.
* tree.h (merge_machine_type_attributes): Rename merge_type_attributes.
(merge_machine_decl_attributes): Rename merge_decl_attributes.
(merge_dllimport_decl_attributes): New prototype.
* target.h: New.
* target-def.h: New.
doc: (Joseph Myers)
* doc/gcc.texi, doc/tm.texi: Update documentation.
cp: Make-lang.in: Update dependencies.
* spew.c: Include target.h.
(duplicate_decls): Call target function.
* decl2.c: include target.h
(import_export_class): Use existence of target function pointer.
* typeck.c: Include target.h.
(qualify_type_recursive): Rename variable. Call target function.
(type_after_usual_arithmetic_conversions): Similarly.
(common_type): Similarly.
config: * 1750a/1750a.c, a29k/29k.c, alpha/alpha.c, arc/arc.c, arm/arm.c,
avr/avr.c, c4x/c4x.c, clipper/clipper.c, convex/convex.c,
d30v/d30v.c, dsp16xx/dsp16xx.c, elxsi/elxsi.c, fr30/fr30.c,
i370/i370.c, i386/i386.c, i860/i860.c, i960/i960.c, ia64/ia64.c,
m32r/m32r.c, m68hc11/m68hc11.c, m68k/m68k.c, m88k/m88k.c,
mips/mips.c, mn10200/mn10200.c, mn10300/mn10300.c, ns32k/ns32k.c,
pa/pa.c, pdp11/pdp11.c, pj/pj.c, romp/romp.c, rs6000/rs6000.c,
sh/sh.c, sparc/sparc.c, v850/v850.c, vax/vax.c, we32k/we32k.c)
: Include target.h and target-def.h. Define target.
* arc/arc-protos.h (arc_valid_machine_decl_attribute): Remove.
* arc/arc.c (arc_valid_machine_decl_attribute): Rename
arc_valid_decl_attribute, make static.
* arc/arc.h (VALID_MACHINE_TYPE_ATTRIBUTE): Remove.
* arm/arm-protos.h (arm_valid_machine_decl_attribute,
arm_valid_type_attribute_p, arm_pe_valid_machine_decl_attribute,
arm_pe_merge_machine_decl_attributes): Remove.
* arm/arm.c (arm_valid_machine_decl_attribute_p): Rename
arm_valid_decl_attribute_p, make static.
(arm_pe_valid_decl_attribute_p): Move from pe.c.
* arm/pe.c (arm_pe_valid_machine_decl_attribute_p): Move to arm.c.
(arm_pe_merge_machine_decl_attributes): Move to tree.c.
* arm/arm.h (VALID_MACHINE_TYPE_ATTRIBUTE): Remove.
* arm/coff.h (VALID_MACHINE_DECL_ATTRIBUTE): Remove.
* arm/elf.h (VALID_MACHINE_DECL_ATTRIBUTE): Remove.
* arm/pe.h (TARGET_DLLIMPORT_DECL_ATTRIBUTES): New.
(VALID_MACHINE_TYPE_ATTRIBUTE, VALID_MACHINE_DECL_ATTRIBUTE): Remove.
* avr/avr-protos.h (valid_machine_type_attribute,
valid_machine_decl_attribute): Remove.
* avr/avr.c (valid_machine_type_attribute,
valid_machine_decl_attribute): Rename and make static.
* avr/avr.h (VALID_MACHINE_TYPE_ATTRIBUTE,
VALID_MACHINE_DECL_ATTRIBUTE): Remove.
* c4x/c4x-protos.h (c4x_valid_type_attribute_p): Remove.
* c4x/c4x.c (c4x_valid_type_attribute_p): Make static.
* c4x/c4x.h (VALID_MACHINE_TYPE_ATTRIBUTE): Remove.
* d30v/d30v.h: Remove obsolete comments.
* h8300/h8300-protos.h (h8300_valid_machine_decl_attribute): Remove.
* h8300/h8300.c (h8300_valid_machine_decl_attribute): Rename, make
static.
* h8300/h8300.h (VALID_MACHINE_DECL_ATTRIBUTE): Remove.
* i386/cygwin.h (TARGET_DLLIMPORT_DECL_ATTRIBUTES): Define.
(i386_pe_merge_decl_attributes, MERGE_MACHINE_DECL_ATTRIBUTES,
i386_pe_valid_type_attributes_p): Remove.
* i386/i386-protos.h (ix86_valid_decl_attribute_p,
ix86_valid_type_attribute_p): Remove.
* i386/i386.c (ix86_valid_decl_attribute_p): Remove.
(ix86_valid_type_attribute_p): Make static.
* i386/i386.h (VALID_MACHINE_DECL_ATTRIBUTE,
VALID_MACHINE_TYPE_ATTRIBUTE): Remove.
* i386/winnt.c (i386_pe_merge_decl_attributes): Move to tree.c.
* ia64/ia64-protos.h (ia64_valid_type_attribute): Remove.
* ia64/ia64.c (ia64_valid_type_attribute): Make static.
* ia64/ia64.h (VALID_MACHINE_TYPE_ATTRIBUTE): Remove.
* m32r/m32r-protos.h (m32r_valid_machine_decl_attribute): Remove.
* m32r/m32r.c (m32r_valid_decl_attribute): Make static.
* m32r/m32r.h (VALID_MACHINE_DECL_ATTRIBUTE): Remove.
* m68hc11/m68hc11-protos.h (m68hc11_valid_decl_attribute_p,
m68hc11_valid_type_attribute_p): Remove.
* m68hc11/m68hc11.c (m68hc11_valid_decl_attribute_p): Remove.
(m68hc11_valid_type_attribute_p): Make static.
* m68hc11/m68hc11.h (VALID_MACHINE_DECL_ATTRIBUTE,
VALID_MACHINE_TYPE_ATTRIBUTE): Remove.
* mcore/mcore-protos.h (mcore_valid_machine_decl_attribute,
mcore_merge_machine_decl_attribute): Remove.
* mcore/mcore.c (mcore_valid_machine_decl_attribute): Rename,
make static.
(mcore_merge_machine_decl_attributes): Move to tree.c.
* mcore/mcore.h (VALID_MACHINE_DECL_ATTRIBUTE,
VALID_MACHINE_TYPE_ATTRIBUTE): Remove.
(TARGET_DLLIMPORT_DECL_ATTRIBUTES): Define.
* ns32k/ns32k-protos.h (ns32k_valid_decl_attribute_p,
ns32k_valid_type_attribute_p): Remove.
* ns32k/ns32k.c (ns32k_valid_decl_attribute_p): Remove.
(ns32k_valid_type_attribute_p): Make static.
* ns32k/ns32k.h (VALID_MACHINE_DECL_ATTRIBUTE,
VALID_MACHINE_TYPE_ATTRIBUTE): Remove.
* rs6000/rs6000-protos.h (rs6000_valid_decl_attribute_p,
rs6000_valid_type_attribute_p): Remove.
* rs6000/rs6000.c (rs6000_valid_decl_attribute_p): Remove.
(rs6000_valid_type_attribute_p): Make static.
* rs6000/rs6000.h (VALID_MACHINE_DECL_ATTRIBUTE,
VALID_MACHINE_TYPE_ATTRIBUTE): Remove.
* sh/sh-protos.h (sh_valid_machine_decl_attribute): Remove.
* sh/sh.c (sh_valid_machine_decl_attribute): Rename, make static.
* sh/sh.h (VALID_MACHINE_DECL_ATTRIBUTE): Remove.
* v850/v850-protos.h (v850_valid_machine_decl_attribute): Remove.
* v850/v850.c (v850_valid_machine_decl_attribute): Rename, make static.
* v850/v850.h (VALID_MACHINE_DECL_ATTRIBUTE): Remove.
From-SVN: r43585
2001-06-26 20:09:27 +02:00
|
|
|
|
#include "target.h"
|
c-common.c (lang_gimplify_stmt): Remove next_p argument.
* c-common.c (lang_gimplify_stmt): Remove next_p argument.
(if_elt, if_stack, if_stack_space, c_expand_start_cond, c_finish_then,
c_expand_end_cond, c_expand_start_else, c_finish_else, c_begin_if_stmt,
c_begin_while_stmt, c_finish_while_stmt_cond): Move to c-typeck.c.
(finish_fname_decls, fname_decl): Use statement_lists.
(c_expand_expr_stmt): Don't set last_expr_type.
(c_type_hash): Fix indentation.
(c_safe_from_p): Don't follow TREE_CHAIN.
(c_tree_chain_matters_p): Remove.
* c-common.def (SCOPE_STMT): Remove.
(CLEANUP_STMT): Redefine to contain its own body.
* c-common.h (struct stmt_tree_s): Remove x_last_stmt,
x_last_expr_type, x_last_expr_filename, x_scope_stmt_stack.
Add x_cur_stmt_list.
(last_tree, last_expr_type, last_expr_filename, RECHAIN_STMTS): Remove.
(cur_stmt_list): New.
(STATEMENT_LIST_STMT_EXPR): New.
(SCOPE_BEGIN_P, SCOPE_END_P, SCOPE_STMT_BLOCK, SCOPE_NULLIFIED_P,
SCOPE_NO_CLEANUPS_P, SCOPE_PARTIAL_P, NEW_FOR_SCOPE_P): Remove.
(CLEANUP_BODY): New.
(CLEANUP_DECL): Move to operand 2.
(c_common_stmt_codes): Remove SCOPE_STMT.
(COMPOUND_STMT_NO_SCOPE, COMPOUND_STMT_BODY_BLOCK): Remove.
* c-decl.c (c_scope_stmt_stack, current_scope_stmt_stack): Remove.
(c_push_function_context, c_pop_function_context): Don't save it.
(finish_decl): Set TREE_USED on the decl for a cleanup.
Use push_cleanup.
(store_parm_decls): Use statement lists.
(finish_function): Remove compstmt rule workaround. Use statement
lists. Call finish_fname_decls after finalizing the body.
(c_begin_compound_stmt): Move to c-typeck.c.
* c-dump.c (c_dump_tree): Remove SCOPE_STMT.
* c-gimplify.c (gimplify_cleanup_stmt, gimplify_cleanup_stmts): New.
(c_genericize): Invoke them.
(c_gimplify_stmt): Don't look through TREE_CHAIN. Kill SCOPE_STMT.
(c_build_bind_expr): Export.
(gimplify_block, gimplify_cleanup): Remove.
(gimplify_condition): Use gimplify_stmt.
(gimplify_for_stmt): Remove FOR_INIT_STMT chaining hack.
(gimplify_if_stmt): Remove recursion hack.
(c_gimplify_expr): Remove STMT_EXPR handling.
(stmt_expr_last_stmt, gimplify_stmt_expr): Remove.
(is_last_stmt_of_scope): Remove.
* c-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
* c-mudflap.c (mflang_flush_calls): Use c_begin_compound_stmt,
c_end_compound_stmt.
* c-objc-common.c (build_cdtor): Likewise.
* c-parse.in (primary): Use c_finish_stmt_expr.
(push_scope, pop_scope): Remove.
(c99_block_start, compstmt_start): Use c_begin_compound_stmt.
(c99_block_end, compstmt): Use c_end_compound_stmt.
(c99_block_lineno_labeled_stmt): Likewise.
(compstmt_primary_start): Use c_begin_stmt_expr.
(simple_if, select_or_iter_stmt): Update calls to stmt builders.
(do_stmt_start): Fill in body directly.
(lineno_stmt): Avoid setting lineno on constants.
* c-pretty-print.c (pp_c_statement): Handle STATEMENT_LIST.
Remove SCOPE_STMT.
* c-semantics.c (begin_stmt_tree): Remove.
(push_stmt_list, re_push_stmt_list, pop_stmt_list): New.
(add_stmt): Use statement lists.
(add_scope_stmt, finish_stmt_tree): Remove.
(push_cleanup): New.
* c-tree.h: Move some decls from c-common.h.
* c-typeck.c (c_tree_expr_nonnegative_p): Simplify for statement lists.
(do_case, c_finish_case): Likewise.
(c_finish_then): Take body for then as argument.
(c_finish_else): Similarly.
(c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): New.
(c_begin_stmt_expr, c_finish_stmt_expr): New.
(c_begin_compound_stmt): Do scope management.
(c_end_compound_stmt): New.
* fold-const.c (tree_expr_nonnegative_p): Fix BIND_EXPR.
* gimplify.c (voidify_wrapper_expr): Accept temporary argument.
Look through exception handling constructs.
(gimplify_bind_expr): Accept temporary argument.
(gimplify_target_expr): Special case BIND_EXPR bodies.
(gimplify_expr): Handle fallback == fb_none like a statement.
* langhooks-def.h (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Kill.
* langhooks.c (lhd_tree_inlining_tree_chain_matters_p): Remove.
* langhooks.h (tree_chain_matters_p): Remove.
* stub-objc.c (objc_clear_super_receiver): New.
* tree-gimple.h (voidify_wrapper_expr): Update decl.
(append_to_statement_list, append_to_statement_list_force): Move
to tree-iterator.h.
* tree-inline.c (expand_call_inline): Update call.
(clone_body): Use statement lists.
(walk_tree): Don't check tree_chain_matters_p.
(copy_tree_r): Likewise.
* tree-iterator.c (alloc_stmt_list): Clear lang bits.
(tsi_link_before, tsi_link_after): Set TREE_SIDE_EFFECTS properly.
* tree-iterator.h (append_to_statement_list,
append_to_statement_list_force): Moved from tree-gimple.h.
* tree-pretty-print.c (dump_generic_node): Clean up TARGET_EXPR dump.
* objc/objc-act.c (build_module_descriptor): Use c_begin_compound_stmt.
(objc_enter_block): Likewise.
(objc_exit_block): Use c_end_compound_stmt.
(objc_build_try_enter_fragment): Add #error and comment for
rewriting for OBJCPLUS.
(objc_build_extract_fragment, objc_build_try_epilogue,
objc_build_catch_stmt, objc_build_finally_prologue,
objc_build_finally_epilogue): Update for C statement builders.
* objc/objc-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P):
Remove.
cp/
* call.c (initialize_reference): Don't build CLEANUP_STMT here.
* cp-gimplify.c (cp_gimplify_stmt): Remove next_p argument.
(genericize_try_block): Use gimplify_stmt.
(genericize_catch_block, genericize_eh_spec_block): Likewise.
(cp_gimplify_init_expr): Remove STMT_EXPR special case.
(gimplify_must_not_throw_expr): Update voidify_wrapper_expr call.
* cp-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
(cp_tree_chain_matters_p): Remove.
* cp-tree.h (COMPOUND_STMT_TRY_BLOCK): New.
(COMPOUND_STMT_BODY_BLOCK): New.
(STATEMENT_LIST_NO_SCOPE, STATEMENT_LIST_TRY_BLOCK): New.
(EXPR_STMT_STMT_EXPR_RESULT): New.
(building_stmt_tree): Check cur_stmt_list.
(tf_stmt_expr_cmpd, tf_stmt_expr_body): Remove.
(BCS_NO_SCOPE, BCS_TRY_BLOCK, BCS_FN_BODY): New.
* decl.c (poplevel): Use pop_stmt_list for minding cleanups.
(cp_finish_decl): Use push_cleanup.
(start_function, finish_function): Use statement lists.
(finish_stmt): Do nothing.
* except.c (begin_eh_spec_block): Use statement lists.
(check_handlers_1, check_handlers): Likewise.
* init.c (construct_virtual_base): Don't add extra compound stmts.
(build_vec_init): Likewise.
* name-lookup.c (maybe_push_cleanup_level): Use statement lists.
* name-lookup.h (struct cp_binding_level): Add statement_list.
* parser.c (cp_parser_statement): Take the STMT_EXPR node, not a bool.
(cp_parser_labeled_statement, cp_parser_expression_statement,
cp_parser_statement_seq_opt): Likewise.
(cp_parser_compound_statement): Likewise. Take bool for try block.
(cp_parser_selection_statement): Tidy if processing.
(cp_parser_already_scoped_statement): Rewrite to do what it says.
* pt.c (tsubst_copy): Move STMT_EXPR to tsubst_expr.
(tsubst_expr): Rewrite STMT_EXPR processing. Handle STATEMENT_LIST.
Mind COMPOUND_STMT_TRY_BLOCK, EXPR_STMT_STMT_EXPR_RESULT.
* semantics.c (do_poplevel, do_pushlevel): Use statement lists.
(finish_cond): New, rewritten from FINISH_COND.
(simplify_loop_decl_cond): New.
(finish_expr_stmt): Avoid nested EXPR_STMTs.
(begin_if_stmt, finish_if_stmt_cond, finish_then_clause,
begin_else_clause, finish_else_clause, finish_if_stmt,
begin_while_stmt, finish_while_stmt_cond, finish_while_stmt,
begin_do_stmt, finish_do_body, begin_for_stmt, finish_for_init_stmt,
finish_for_cond, finish_for_stmt, begin_switch_stmt,
finish_switch_cond, finish_switch_stmt, begin_try_block,
finish_try_block, finish_cleanup_try_block, finish_function_try_block,
finish_handler_sequence, finish_function_handler_sequence,
begin_handler, finish_handler_parms, finish_handler,
begin_stmt_expr, finish_stmt_expr_expr, finish_stmt_expr): Rewrite
using statement lists.
(begin_compound_stmt): Replace has_no_scope argument with flags.
Update all callers. Use statement lists.
(finish_compound_stmt): Likewise.
(finish_decl_cleanup, finish_eh_cleanup): Use push_cleanup.
(current_scope_stmt_stack): Remove.
(simplify_aggr_init_expr): Don't muck with TREE_CHAIN.
* typeck2.c (split_nonconstant_init_1, split_nonconstant_init):
Rewrite with statement lists.
testsuite/
* g++.dg/ext/stmtexpr1.C: XFAIL.
* gcc.dg/20030612-1.c: XFAIL.
From-SVN: r83221
2004-06-16 03:21:38 +02:00
|
|
|
|
#include "tree-iterator.h"
|
2004-06-21 11:15:29 +02:00
|
|
|
|
#include "tree-gimple.h"
|
c-common.c (lang_gimplify_stmt): Remove next_p argument.
* c-common.c (lang_gimplify_stmt): Remove next_p argument.
(if_elt, if_stack, if_stack_space, c_expand_start_cond, c_finish_then,
c_expand_end_cond, c_expand_start_else, c_finish_else, c_begin_if_stmt,
c_begin_while_stmt, c_finish_while_stmt_cond): Move to c-typeck.c.
(finish_fname_decls, fname_decl): Use statement_lists.
(c_expand_expr_stmt): Don't set last_expr_type.
(c_type_hash): Fix indentation.
(c_safe_from_p): Don't follow TREE_CHAIN.
(c_tree_chain_matters_p): Remove.
* c-common.def (SCOPE_STMT): Remove.
(CLEANUP_STMT): Redefine to contain its own body.
* c-common.h (struct stmt_tree_s): Remove x_last_stmt,
x_last_expr_type, x_last_expr_filename, x_scope_stmt_stack.
Add x_cur_stmt_list.
(last_tree, last_expr_type, last_expr_filename, RECHAIN_STMTS): Remove.
(cur_stmt_list): New.
(STATEMENT_LIST_STMT_EXPR): New.
(SCOPE_BEGIN_P, SCOPE_END_P, SCOPE_STMT_BLOCK, SCOPE_NULLIFIED_P,
SCOPE_NO_CLEANUPS_P, SCOPE_PARTIAL_P, NEW_FOR_SCOPE_P): Remove.
(CLEANUP_BODY): New.
(CLEANUP_DECL): Move to operand 2.
(c_common_stmt_codes): Remove SCOPE_STMT.
(COMPOUND_STMT_NO_SCOPE, COMPOUND_STMT_BODY_BLOCK): Remove.
* c-decl.c (c_scope_stmt_stack, current_scope_stmt_stack): Remove.
(c_push_function_context, c_pop_function_context): Don't save it.
(finish_decl): Set TREE_USED on the decl for a cleanup.
Use push_cleanup.
(store_parm_decls): Use statement lists.
(finish_function): Remove compstmt rule workaround. Use statement
lists. Call finish_fname_decls after finalizing the body.
(c_begin_compound_stmt): Move to c-typeck.c.
* c-dump.c (c_dump_tree): Remove SCOPE_STMT.
* c-gimplify.c (gimplify_cleanup_stmt, gimplify_cleanup_stmts): New.
(c_genericize): Invoke them.
(c_gimplify_stmt): Don't look through TREE_CHAIN. Kill SCOPE_STMT.
(c_build_bind_expr): Export.
(gimplify_block, gimplify_cleanup): Remove.
(gimplify_condition): Use gimplify_stmt.
(gimplify_for_stmt): Remove FOR_INIT_STMT chaining hack.
(gimplify_if_stmt): Remove recursion hack.
(c_gimplify_expr): Remove STMT_EXPR handling.
(stmt_expr_last_stmt, gimplify_stmt_expr): Remove.
(is_last_stmt_of_scope): Remove.
* c-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
* c-mudflap.c (mflang_flush_calls): Use c_begin_compound_stmt,
c_end_compound_stmt.
* c-objc-common.c (build_cdtor): Likewise.
* c-parse.in (primary): Use c_finish_stmt_expr.
(push_scope, pop_scope): Remove.
(c99_block_start, compstmt_start): Use c_begin_compound_stmt.
(c99_block_end, compstmt): Use c_end_compound_stmt.
(c99_block_lineno_labeled_stmt): Likewise.
(compstmt_primary_start): Use c_begin_stmt_expr.
(simple_if, select_or_iter_stmt): Update calls to stmt builders.
(do_stmt_start): Fill in body directly.
(lineno_stmt): Avoid setting lineno on constants.
* c-pretty-print.c (pp_c_statement): Handle STATEMENT_LIST.
Remove SCOPE_STMT.
* c-semantics.c (begin_stmt_tree): Remove.
(push_stmt_list, re_push_stmt_list, pop_stmt_list): New.
(add_stmt): Use statement lists.
(add_scope_stmt, finish_stmt_tree): Remove.
(push_cleanup): New.
* c-tree.h: Move some decls from c-common.h.
* c-typeck.c (c_tree_expr_nonnegative_p): Simplify for statement lists.
(do_case, c_finish_case): Likewise.
(c_finish_then): Take body for then as argument.
(c_finish_else): Similarly.
(c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): New.
(c_begin_stmt_expr, c_finish_stmt_expr): New.
(c_begin_compound_stmt): Do scope management.
(c_end_compound_stmt): New.
* fold-const.c (tree_expr_nonnegative_p): Fix BIND_EXPR.
* gimplify.c (voidify_wrapper_expr): Accept temporary argument.
Look through exception handling constructs.
(gimplify_bind_expr): Accept temporary argument.
(gimplify_target_expr): Special case BIND_EXPR bodies.
(gimplify_expr): Handle fallback == fb_none like a statement.
* langhooks-def.h (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Kill.
* langhooks.c (lhd_tree_inlining_tree_chain_matters_p): Remove.
* langhooks.h (tree_chain_matters_p): Remove.
* stub-objc.c (objc_clear_super_receiver): New.
* tree-gimple.h (voidify_wrapper_expr): Update decl.
(append_to_statement_list, append_to_statement_list_force): Move
to tree-iterator.h.
* tree-inline.c (expand_call_inline): Update call.
(clone_body): Use statement lists.
(walk_tree): Don't check tree_chain_matters_p.
(copy_tree_r): Likewise.
* tree-iterator.c (alloc_stmt_list): Clear lang bits.
(tsi_link_before, tsi_link_after): Set TREE_SIDE_EFFECTS properly.
* tree-iterator.h (append_to_statement_list,
append_to_statement_list_force): Moved from tree-gimple.h.
* tree-pretty-print.c (dump_generic_node): Clean up TARGET_EXPR dump.
* objc/objc-act.c (build_module_descriptor): Use c_begin_compound_stmt.
(objc_enter_block): Likewise.
(objc_exit_block): Use c_end_compound_stmt.
(objc_build_try_enter_fragment): Add #error and comment for
rewriting for OBJCPLUS.
(objc_build_extract_fragment, objc_build_try_epilogue,
objc_build_catch_stmt, objc_build_finally_prologue,
objc_build_finally_epilogue): Update for C statement builders.
* objc/objc-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P):
Remove.
cp/
* call.c (initialize_reference): Don't build CLEANUP_STMT here.
* cp-gimplify.c (cp_gimplify_stmt): Remove next_p argument.
(genericize_try_block): Use gimplify_stmt.
(genericize_catch_block, genericize_eh_spec_block): Likewise.
(cp_gimplify_init_expr): Remove STMT_EXPR special case.
(gimplify_must_not_throw_expr): Update voidify_wrapper_expr call.
* cp-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
(cp_tree_chain_matters_p): Remove.
* cp-tree.h (COMPOUND_STMT_TRY_BLOCK): New.
(COMPOUND_STMT_BODY_BLOCK): New.
(STATEMENT_LIST_NO_SCOPE, STATEMENT_LIST_TRY_BLOCK): New.
(EXPR_STMT_STMT_EXPR_RESULT): New.
(building_stmt_tree): Check cur_stmt_list.
(tf_stmt_expr_cmpd, tf_stmt_expr_body): Remove.
(BCS_NO_SCOPE, BCS_TRY_BLOCK, BCS_FN_BODY): New.
* decl.c (poplevel): Use pop_stmt_list for minding cleanups.
(cp_finish_decl): Use push_cleanup.
(start_function, finish_function): Use statement lists.
(finish_stmt): Do nothing.
* except.c (begin_eh_spec_block): Use statement lists.
(check_handlers_1, check_handlers): Likewise.
* init.c (construct_virtual_base): Don't add extra compound stmts.
(build_vec_init): Likewise.
* name-lookup.c (maybe_push_cleanup_level): Use statement lists.
* name-lookup.h (struct cp_binding_level): Add statement_list.
* parser.c (cp_parser_statement): Take the STMT_EXPR node, not a bool.
(cp_parser_labeled_statement, cp_parser_expression_statement,
cp_parser_statement_seq_opt): Likewise.
(cp_parser_compound_statement): Likewise. Take bool for try block.
(cp_parser_selection_statement): Tidy if processing.
(cp_parser_already_scoped_statement): Rewrite to do what it says.
* pt.c (tsubst_copy): Move STMT_EXPR to tsubst_expr.
(tsubst_expr): Rewrite STMT_EXPR processing. Handle STATEMENT_LIST.
Mind COMPOUND_STMT_TRY_BLOCK, EXPR_STMT_STMT_EXPR_RESULT.
* semantics.c (do_poplevel, do_pushlevel): Use statement lists.
(finish_cond): New, rewritten from FINISH_COND.
(simplify_loop_decl_cond): New.
(finish_expr_stmt): Avoid nested EXPR_STMTs.
(begin_if_stmt, finish_if_stmt_cond, finish_then_clause,
begin_else_clause, finish_else_clause, finish_if_stmt,
begin_while_stmt, finish_while_stmt_cond, finish_while_stmt,
begin_do_stmt, finish_do_body, begin_for_stmt, finish_for_init_stmt,
finish_for_cond, finish_for_stmt, begin_switch_stmt,
finish_switch_cond, finish_switch_stmt, begin_try_block,
finish_try_block, finish_cleanup_try_block, finish_function_try_block,
finish_handler_sequence, finish_function_handler_sequence,
begin_handler, finish_handler_parms, finish_handler,
begin_stmt_expr, finish_stmt_expr_expr, finish_stmt_expr): Rewrite
using statement lists.
(begin_compound_stmt): Replace has_no_scope argument with flags.
Update all callers. Use statement lists.
(finish_compound_stmt): Likewise.
(finish_decl_cleanup, finish_eh_cleanup): Use push_cleanup.
(current_scope_stmt_stack): Remove.
(simplify_aggr_init_expr): Don't muck with TREE_CHAIN.
* typeck2.c (split_nonconstant_init_1, split_nonconstant_init):
Rewrite with statement lists.
testsuite/
* g++.dg/ext/stmtexpr1.C: XFAIL.
* gcc.dg/20030612-1.c: XFAIL.
From-SVN: r83221
2004-06-16 03:21:38 +02:00
|
|
|
|
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
1993-12-16 00:30:48 +01:00
|
|
|
|
/* Nonzero if we've already printed a "missing braces around initializer"
|
1993-03-28 07:48:46 +02:00
|
|
|
|
message within this initializer. */
|
1993-12-16 00:30:48 +01:00
|
|
|
|
static int missing_braces_mentioned;
|
1993-03-28 07:48:46 +02:00
|
|
|
|
|
2004-06-07 20:49:36 +02:00
|
|
|
|
static int require_constant_value;
|
|
|
|
|
|
static int require_constant_elements;
|
|
|
|
|
|
|
2003-07-06 20:59:38 +02:00
|
|
|
|
static tree qualify_type (tree, tree);
|
2004-06-13 19:14:09 +02:00
|
|
|
|
static int tagged_types_tu_compatible_p (tree, tree);
|
2003-07-06 20:59:38 +02:00
|
|
|
|
static int comp_target_types (tree, tree, int);
|
2004-06-13 19:14:09 +02:00
|
|
|
|
static int function_types_compatible_p (tree, tree);
|
|
|
|
|
|
static int type_lists_compatible_p (tree, tree);
|
2003-07-06 20:59:38 +02:00
|
|
|
|
static tree decl_constant_value_for_broken_optimization (tree);
|
|
|
|
|
|
static tree default_function_array_conversion (tree);
|
|
|
|
|
|
static tree lookup_field (tree, tree);
|
|
|
|
|
|
static tree convert_arguments (tree, tree, tree, tree);
|
|
|
|
|
|
static tree pointer_diff (tree, tree);
|
|
|
|
|
|
static tree convert_for_assignment (tree, tree, const char *, tree, tree,
|
|
|
|
|
|
int);
|
|
|
|
|
|
static void warn_for_assignment (const char *, const char *, tree, int);
|
|
|
|
|
|
static tree valid_compound_expr_initializer (tree, tree);
|
|
|
|
|
|
static void push_string (const char *);
|
|
|
|
|
|
static void push_member_name (tree);
|
|
|
|
|
|
static void push_array_bounds (int);
|
|
|
|
|
|
static int spelling_length (void);
|
|
|
|
|
|
static char *print_spelling (char *);
|
|
|
|
|
|
static void warning_init (const char *);
|
2004-07-22 01:46:20 +02:00
|
|
|
|
static tree digest_init (tree, tree, bool, int);
|
|
|
|
|
|
static void output_init_element (tree, bool, tree, tree, int);
|
2003-07-06 20:59:38 +02:00
|
|
|
|
static void output_pending_init_elements (int);
|
|
|
|
|
|
static int set_designator (int);
|
|
|
|
|
|
static void push_range_stack (tree);
|
|
|
|
|
|
static void add_pending_init (tree, tree);
|
|
|
|
|
|
static void set_nonincremental_init (void);
|
|
|
|
|
|
static void set_nonincremental_init_from_string (tree);
|
|
|
|
|
|
static tree find_init_member (tree);
|
2004-06-07 04:10:55 +02:00
|
|
|
|
static int lvalue_or_else (tree, const char *);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
|
|
|
|
|
/* Do `exp = require_complete_type (exp);' to make sure exp
|
|
|
|
|
|
does not have an incomplete type. (That includes void types.) */
|
|
|
|
|
|
|
|
|
|
|
|
tree
|
2003-06-22 15:41:26 +02:00
|
|
|
|
require_complete_type (tree value)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
|
|
|
|
|
tree type = TREE_TYPE (value);
|
|
|
|
|
|
|
2002-01-23 20:30:49 +01:00
|
|
|
|
if (value == error_mark_node || type == error_mark_node)
|
1999-05-09 21:56:58 +02:00
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
|
1992-02-28 19:53:39 +01:00
|
|
|
|
/* First, detect a valid value with a complete type. */
|
tree.h (COMPLETE_TYPE_P): New macro.
gcc
* tree.h (COMPLETE_TYPE_P): New macro.
(COMPLETE_OR_VOID_TYPE_P): New macro.
(COMPLETE_OR_UNBOUND_ARRAY_TYPE_P): New macro.
* stor-layout.c (layout_type, case VOID_TYPE): Don't set TYPE_SIZE.
* c-aux-info.c (gen_type): Use them.
* c-common.c (c_expand_expr_stmt): Likewise.
* c-decl.c (poplevel, pushdecl, start_decl, finish_decl,
grokdeclarator, grokparms, finish_struct, start_function,
store_parm_decls, combine_parm_decls): Likewise.
* c-parse.y (cast_expr): Likewise.
* c-typeck.c (require_complete_type, c_sizeof, c_sizeof_nowarn,
c_size_in_bytes, c_alignof, build_component_ref,
build_indirect_ref, build_array_ref, convert_arguments,
build_binary_op, pointer_diff, build_unary_op, digest_init: Likewise.
* calls.c (initialize_argument_information): Likewise.
* convert.c (convert_to_integer): Likewise.
* dbxout.c (dbxout_typedefs, dbxout_type, dbxout_symbol): Likewise.
* dwarfout.c (location_or_const_value_attribute,
output_enumeration_type_die, output_structure_type_die,
output_union_type_die, output_type): Likewise.
* expr.c (safe_from_p, expand_expr): Likewise.
* function.c (assign_parms): Likewise.
* sdbout.c (sdbout_symbol, sdbout_one_type): Likewise.
* tree.c (build_array_type, build_function_type,
build_method_type, build_offset_type, build_complex_type): Likewise.
* c-parse.c, c-parse.h: Regenerated.
gcc/cp
* typeck.c (require_complete_type, complete_type,
complete_type_or_else, c_sizeof, c_sizeof_nowarn,
build_array_ref, convert_arguments, pointer_diff,
build_x_unary_op, build_unary_op, build_c_cast,
build_modify_expr): Use COMPLETE_TYPE_P etc.
* call.c (is_complete, convert_like_real,
build_new_method_call): Likewise.
* class.c (build_vbase_pointer_fields, check_bases,
build_base_field, finish_struct_1, pushclass): Likewise.
* cvt.c (cp_convert_to_pointer, convert_to_void): Likewise.
* decl.c (maybe_process_template_type_declaration, pushtag,
pushdecl, redeclaration_error_message, start_decl, start_decl_1,
layout_var_decl, check_initializer, cp_finish_decl,
grokdeclarator, require_complete_types_for_parms,
grok_op_properties, xref_tag, xref_basetypes,
check_function_type): Likewise.
* decl2.c (check_classfn, reparse_absdcl_as_casts): Likewise.
* friend.c (do_friend): Likewise.
* init.c (build_offset_ref): Likewise.
* parse.y (structsp): Likewise.
* pt.c (maybe_process_partial_specialization,
tsubst_friend_function, instantiate_class_template, tsubst,
do_type_instantiation, instantiate_pending_templates): Likewise.
* repo.c (repo_get_id): Likewise.
* rtti.c (build_typeid, get_typeid, build_dynamic_cast_1,
synthesize_tinfo_var, emit_support_tinfos): Likewise.
* search.c (lookup_fnfields_1, lookup_conversions): Likewise.
* semantics.c (begin_class_definition): Likewise.
* tree.c (build_cplus_method_type): Likewise.
* typeck2.c (digest_init, build_functional_cast,
add_exception_specifier): Likewise.
* parse.h, parse.c: Regenerated.
From-SVN: r32671
2000-03-21 19:10:48 +01:00
|
|
|
|
if (COMPLETE_TYPE_P (type))
|
1992-02-28 19:53:39 +01:00
|
|
|
|
return value;
|
|
|
|
|
|
|
2002-04-18 19:54:11 +02:00
|
|
|
|
c_incomplete_type_error (value, type);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Print an error message for invalid use of an incomplete type.
|
|
|
|
|
|
VALUE is the expression that was used (or 0 if that isn't known)
|
|
|
|
|
|
and TYPE is the type that was invalid. */
|
|
|
|
|
|
|
|
|
|
|
|
void
|
2003-06-22 15:41:26 +02:00
|
|
|
|
c_incomplete_type_error (tree value, tree type)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
bitmap.c (bitmap_print): Qualify a char* with the `const' keyword.
* bitmap.c (bitmap_print): Qualify a char* with the `const' keyword.
* bitmap.h (bitmap_print): Likewise.
* c-decl.c (builtin_function, grokdeclarator, grokfield): Likewise.
* c-lang.c (build_objc_string): Likewise.
* c-lex.c (yyerror, extend_token_buffer): Likewise. Don't include
limits.h or ctype.h. Remove unused variable `p'.
* c-lex.h (yyerror): Qualify a char* with the `const' keyword.
* c-pragma.c (handle_pragma_token): Likewise.
* c-pragma.h (handle_pragma_token): Likewise.
* c-tree.h (build_objc_string, builtin_function, grokfield,
build_indirect_ref, lvalue_or_else, readonly_warning, error_init,
pedwarn_init): Likewise.
* c-typeck.c (convert_for_assignment, warn_for_assignment,
push_string, warning_init, incomplete_type_error,
build_indirect_ref, lvalue_or_else, readonly_warning,
build_c_cast, spelling, push_member_name, print_spelling,
error_init, pedwarn_init, start_init): Likewise.
* objc/objc-act.c (build_objc_string): Likewise.
* print-tree.c (print_node_brief, print_node): Likewise.
* tree.h (lvalue_or_else, print_node, print_node_brief): Likewise.
From-SVN: r25296
1999-02-18 21:38:48 +01:00
|
|
|
|
const char *type_code_string;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
|
|
|
|
|
/* Avoid duplicate error message. */
|
|
|
|
|
|
if (TREE_CODE (type) == ERROR_MARK)
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
if (value != 0 && (TREE_CODE (value) == VAR_DECL
|
|
|
|
|
|
|| TREE_CODE (value) == PARM_DECL))
|
|
|
|
|
|
error ("`%s' has an incomplete type",
|
|
|
|
|
|
IDENTIFIER_POINTER (DECL_NAME (value)));
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
retry:
|
|
|
|
|
|
/* We must print an error message. Be clever about what it says. */
|
|
|
|
|
|
|
|
|
|
|
|
switch (TREE_CODE (type))
|
|
|
|
|
|
{
|
|
|
|
|
|
case RECORD_TYPE:
|
1999-01-27 02:43:17 +01:00
|
|
|
|
type_code_string = "struct";
|
1992-02-28 19:53:39 +01:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case UNION_TYPE:
|
1999-01-27 02:43:17 +01:00
|
|
|
|
type_code_string = "union";
|
1992-02-28 19:53:39 +01:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case ENUMERAL_TYPE:
|
1999-01-27 02:43:17 +01:00
|
|
|
|
type_code_string = "enum";
|
1992-02-28 19:53:39 +01:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case VOID_TYPE:
|
|
|
|
|
|
error ("invalid use of void expression");
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
case ARRAY_TYPE:
|
|
|
|
|
|
if (TYPE_DOMAIN (type))
|
|
|
|
|
|
{
|
2002-02-11 03:28:00 +01:00
|
|
|
|
if (TYPE_MAX_VALUE (TYPE_DOMAIN (type)) == NULL)
|
|
|
|
|
|
{
|
|
|
|
|
|
error ("invalid use of flexible array member");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
type = TREE_TYPE (type);
|
|
|
|
|
|
goto retry;
|
|
|
|
|
|
}
|
|
|
|
|
|
error ("invalid use of array with unspecified bounds");
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
|
abort ();
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (TREE_CODE (TYPE_NAME (type)) == IDENTIFIER_NODE)
|
1999-01-27 02:43:17 +01:00
|
|
|
|
error ("invalid use of undefined type `%s %s'",
|
|
|
|
|
|
type_code_string, IDENTIFIER_POINTER (TYPE_NAME (type)));
|
1992-02-28 19:53:39 +01:00
|
|
|
|
else
|
|
|
|
|
|
/* If this type has a typedef-name, the TYPE_NAME is a TYPE_DECL. */
|
|
|
|
|
|
error ("invalid use of incomplete typedef `%s'",
|
|
|
|
|
|
IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (type))));
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2002-04-19 08:22:18 +02:00
|
|
|
|
/* Given a type, apply default promotions wrt unnamed function
|
|
|
|
|
|
arguments and return the new type. */
|
|
|
|
|
|
|
|
|
|
|
|
tree
|
2003-06-22 15:41:26 +02:00
|
|
|
|
c_type_promotes_to (tree type)
|
2002-04-19 08:22:18 +02:00
|
|
|
|
{
|
|
|
|
|
|
if (TYPE_MAIN_VARIANT (type) == float_type_node)
|
|
|
|
|
|
return double_type_node;
|
|
|
|
|
|
|
|
|
|
|
|
if (c_promoting_integer_type_p (type))
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Preserve unsignedness if not really getting any wider. */
|
builtins.c, [...]: Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* builtins.c, c-aux-info.c, c-common.c, c-cppbuiltin.c, c-decl.c:
Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* c-format.c, c-opts.c, c-pretty-print.c, c-typeck.c: Likewise.
* calls.c, convert.c, dbxout.c, dojump.c, dwarf2out.c: Likewise.
* expmed.c, expr.c, fold-const.c, function.c, integrate.c: Likewise.
* optabs.c, sdbout.c, stmt.c, stor-layout.c, tree-dump.c: Likewise.
* tree.c, config/iq2000/iq2000.c, config/m32r/m32r.c: Likewise.
* config/mips/mips.c, config/rs6000/rs6000.c: Likewise.
* config/s390/s390.c, config/sparc/sparc.c, objc/objc-act.c: Likewise.
* stor-layout.c (layout_type, case COMPLEX_TYPE): Test for
REAL_TYPE, not INTEGER_TYPE.
(layout_type, case VECTOR_TYPE): Simplify code.
* tree.c (build_vector_type_for_mode): Remove dup unsigned setting.
* tree.h: Update comments.
(STRIP_NOPS): Use TYPE_UNSIGNED.
(TYPE_UNSIGNED): New macro.
(TYPE_TRAP_SIGNED): Remove now redundant check.
(SAVE_EXPR_NOPLACEHOLDER): Don't use TREE_UNSIGNED.
* cp/call.c (joust): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* cp/class.c (check_bitfield_decl): Likewise.
* cp/cvt.c (type_promotes_to): Likewise.
* cp/decl.c (finish_enum): Likewise.
* cp/mangle.c (write_builtin_type): Likewise.
* cp/semantics.c (finish_switch_cond, finish_unary_op_expr): Likewise.
* cp/typeck.c (type_after_usual_arithmetic_conversions): Likewise.
(build_binary_op): Likewise.
* f/com.c (ffecom_arrayref_): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
(ffecom_expr_): Likewise.
* java/jcf-write.c (generate_bytecode_insns): Use TYPE_UNSIGNED.
* treelang/treetree.c (tree_lang_signed_or_unsigned_type):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/decl.c (gnat_to_gnu_entity, make_type_from_size):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/trans.c (tree_transform, convert_with_check): Likewise.
* ada/utils.c (gnat_signed_or_unsigned_type): Likewise.
(build_vms_descriptor, unchecked_convert): Likewise.
* ada/utils2.c (nonbinary_modular_operation): Likewise.
From-SVN: r80287
2004-04-01 05:50:43 +02:00
|
|
|
|
if (TYPE_UNSIGNED (type)
|
2002-04-19 08:22:18 +02:00
|
|
|
|
&& (TYPE_PRECISION (type) == TYPE_PRECISION (integer_type_node)))
|
|
|
|
|
|
return unsigned_type_node;
|
|
|
|
|
|
return integer_type_node;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return type;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
1992-02-28 19:53:39 +01:00
|
|
|
|
/* Return a variant of TYPE which has all the type qualifiers of LIKE
|
|
|
|
|
|
as well as those of TYPE. */
|
|
|
|
|
|
|
|
|
|
|
|
static tree
|
2003-06-22 15:41:26 +02:00
|
|
|
|
qualify_type (tree type, tree like)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-06-22 15:41:26 +02:00
|
|
|
|
return c_build_qualified_type (type,
|
1999-09-16 06:16:32 +02:00
|
|
|
|
TYPE_QUALS (type) | TYPE_QUALS (like));
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
2004-06-06 17:21:59 +02:00
|
|
|
|
/* Return the composite type of two compatible types.
|
2004-05-29 20:40:27 +02:00
|
|
|
|
|
2004-06-06 17:21:59 +02:00
|
|
|
|
We assume that comptypes has already been done and returned
|
|
|
|
|
|
nonzero; if that isn't so, this may crash. In particular, we
|
|
|
|
|
|
assume that qualifiers match. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
|
|
|
|
|
tree
|
2004-06-06 17:21:59 +02:00
|
|
|
|
composite_type (tree t1, tree t2)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2001-10-11 05:16:15 +02:00
|
|
|
|
enum tree_code code1;
|
|
|
|
|
|
enum tree_code code2;
|
1994-05-07 00:29:58 +02:00
|
|
|
|
tree attributes;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
|
|
|
|
|
/* Save time if the two types are the same. */
|
|
|
|
|
|
|
|
|
|
|
|
if (t1 == t2) return t1;
|
|
|
|
|
|
|
|
|
|
|
|
/* If one type is nonsense, use the other. */
|
|
|
|
|
|
if (t1 == error_mark_node)
|
|
|
|
|
|
return t2;
|
|
|
|
|
|
if (t2 == error_mark_node)
|
|
|
|
|
|
return t1;
|
|
|
|
|
|
|
2004-06-06 17:21:59 +02:00
|
|
|
|
code1 = TREE_CODE (t1);
|
|
|
|
|
|
code2 = TREE_CODE (t2);
|
|
|
|
|
|
|
1998-02-18 11:38:57 +01:00
|
|
|
|
/* Merge the attributes. */
|
alias.c, [...]: Replace calls via (*targetm.foo) () with targetm.foo ().
* alias.c, attribs.c, bt-load.c, builtins.c, c-common.c,
c-decl.c, c-objc-common.c, c-typeck.c, calls.c, cfglayout.c,
cse.c, dbxout.c, dwarf2out.c, except.c, final.c,
haifa-sched.c, integrate.c, passes.c, rtlanal.c, sched-rgn.c,
sched-vis.c, simplify-rtx.c, stor-layout.c, tree.c, varasm.c,
vmsdbgout.c: Replace calls via (*targetm.foo) () with
targetm.foo ().
From-SVN: r79729
2004-03-20 05:52:59 +01:00
|
|
|
|
attributes = targetm.merge_type_attributes (t1, t2);
|
1994-05-07 00:29:58 +02:00
|
|
|
|
|
2004-06-06 17:21:59 +02:00
|
|
|
|
/* If one is an enumerated type and the other is the compatible
|
|
|
|
|
|
integer type, the composite type might be either of the two
|
|
|
|
|
|
(DR#013 question 3). For consistency, use the enumerated type as
|
|
|
|
|
|
the composite type. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2004-06-06 17:21:59 +02:00
|
|
|
|
if (code1 == ENUMERAL_TYPE && code2 == INTEGER_TYPE)
|
|
|
|
|
|
return t1;
|
|
|
|
|
|
if (code2 == ENUMERAL_TYPE && code1 == INTEGER_TYPE)
|
|
|
|
|
|
return t2;
|
1993-12-25 14:30:49 +01:00
|
|
|
|
|
2004-06-06 17:21:59 +02:00
|
|
|
|
if (code1 != code2)
|
|
|
|
|
|
abort ();
|
1993-03-04 21:36:23 +01:00
|
|
|
|
|
1992-02-28 19:53:39 +01:00
|
|
|
|
switch (code1)
|
|
|
|
|
|
{
|
|
|
|
|
|
case POINTER_TYPE:
|
2004-06-06 17:21:59 +02:00
|
|
|
|
/* For two pointers, do this recursively on the target type. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
invoke.texi: Document -flang-isoc9x.
* invoke.texi: Document -flang-isoc9x.
* Makefile.in (OBJS): Add splay-tree.o.
(c-common.o): Depend on rtl.h.
(splay-tree.o): List dependencies and provide build rule.
* rtl.h (record_alias_subset): New function.
* alias.c: Include splay-tree.h.
(alias_set_entry): New type.
(CHECK_ALIAS_SETS_FOR_CONSISTENCY): Remove.
(DIFFERENT_ALIAS_SETS_P): Use mem_in_disjoint_alias_sets_p.
(mems_in_disjoin_alias_sets_p): New function.
(alias_set_compare): Likewise.
(insert_subset_children): Likewise.
(get_alias_set_entry): Likewise.
* tree.h (TYPE_RESTRICT): New macro.
(TYPE_UNQUALIFIED): New manifest constant.
(TYPE_QUAL_CONST): Likewise
(TYPE_QUAL_VOLATILE): Likewise.
(TYPE_QUAL_RESTRICT): Likewise.
(tree_type): Add restrict_flag. Reduce count of free bits.
(DECL_POINTER_ALIAS_SET): New macro.
(DECL_POINTER_ALIAS_SET_KNOWN_P): Likewise.
(tree_decl): Add pointer_alias_set.
(build_qualified_type): New function.
(build_type_variant): Define in terms of build_qualified_type.
* tree.c (set_type_quals): New function.
(make_node): Initializae DECL_POINTER_ALIAS_SET.
(build_type_attribute_variant): Use build_qualified_type and
set_type_quals.
(build_type_variant): Rename, and modify, to become...
(build_qualified_type): New function.
(build_complex_type): Use set_type_quals.
* c-tree.h (C_TYPE_OBJECT_P): New macro.
(C_TYPE_FUNCTION_P): Likewise.
(C_TYPE_INCOMPLETE_P): Likewise.
(C_TYPE_OBJECT_OR_INCOMPLETE_P): Likewise.
(c_apply_type_quals_to_decl): New function.
(c_build_qualified_type): New function.
(c_build_type_variant): Define in terms of c_build_qualified_type.
(flag_isoc9x): Declare.
* c-typeck.c (qualify_type): Use c_build_qualified_type.
(common_type): Change to use TYPE_QUALS.
(comptypes): Likewise.
(convert_for_assignment): Likewise.
* c-aux-info.c (gen_type): Likewise. Deal with `restrict'.
* c-decl.c (flag_isoc9x): Define.
(c_decode_option): Handle -flang-isoc9x.
(grokdeclarator): Update to handle restrict. Use TYPE_QUALS,
c_build_qualified_type, etc. Use c_apply_type_quals_to_decl.
* c-lex.c (init_lex): Deal with restrict.
(init_lex): Don't treat restrict as a reserved word in
-traditional mode, or without -flang-isoc9x.
* c-lex.h (rid): Add RID_RESTRICT.
* c-parse.gperf (restrict, __restrict, __restrict__): Make
equivalent to RID_RESTRICT.
* c-parse.in (TYPE_QUAL): Update comment.
* c-common.c: Include rtl.h.
(c_find_base_decl): New function.
(c_build_type_variant): Rename, and modify, to become ...
(c_build_qualified_type): New function.
(c_apply_type_quals_to_decl): Likewise.
(c_get_alias_set): For INDIRECT_REFs, check to see if we can find
a particular alias set for the reference.
* toplev.c (documented_lang_options): Add -flang-isoc9x.
From-SVN: r23212
1998-10-21 11:53:40 +02:00
|
|
|
|
tree pointed_to_1 = TREE_TYPE (t1);
|
|
|
|
|
|
tree pointed_to_2 = TREE_TYPE (t2);
|
2004-06-06 17:21:59 +02:00
|
|
|
|
tree target = composite_type (pointed_to_1, pointed_to_2);
|
|
|
|
|
|
t1 = build_pointer_type (target);
|
2004-06-23 19:05:45 +02:00
|
|
|
|
t1 = build_type_attribute_variant (t1, attributes);
|
|
|
|
|
|
return qualify_type (t1, t2);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
case ARRAY_TYPE:
|
|
|
|
|
|
{
|
2004-06-06 17:21:59 +02:00
|
|
|
|
tree elt = composite_type (TREE_TYPE (t1), TREE_TYPE (t2));
|
2004-06-23 22:53:17 +02:00
|
|
|
|
|
|
|
|
|
|
/* We should not have any type quals on arrays at all. */
|
|
|
|
|
|
if (TYPE_QUALS (t1) || TYPE_QUALS (t2))
|
|
|
|
|
|
abort ();
|
|
|
|
|
|
|
1992-02-28 19:53:39 +01:00
|
|
|
|
/* Save space: see if the result is identical to one of the args. */
|
|
|
|
|
|
if (elt == TREE_TYPE (t1) && TYPE_DOMAIN (t1))
|
1994-05-07 00:29:58 +02:00
|
|
|
|
return build_type_attribute_variant (t1, attributes);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
if (elt == TREE_TYPE (t2) && TYPE_DOMAIN (t2))
|
1994-05-07 00:29:58 +02:00
|
|
|
|
return build_type_attribute_variant (t2, attributes);
|
2004-06-23 22:53:17 +02:00
|
|
|
|
|
|
|
|
|
|
if (elt == TREE_TYPE (t1) && !TYPE_DOMAIN (t2) && !TYPE_DOMAIN (t1))
|
|
|
|
|
|
return build_type_attribute_variant (t1, attributes);
|
|
|
|
|
|
if (elt == TREE_TYPE (t2) && !TYPE_DOMAIN (t2) && !TYPE_DOMAIN (t1))
|
|
|
|
|
|
return build_type_attribute_variant (t2, attributes);
|
|
|
|
|
|
|
1992-02-28 19:53:39 +01:00
|
|
|
|
/* Merge the element types, and have a size if either arg has one. */
|
1994-05-07 00:29:58 +02:00
|
|
|
|
t1 = build_array_type (elt, TYPE_DOMAIN (TYPE_DOMAIN (t1) ? t1 : t2));
|
2004-06-23 22:53:17 +02:00
|
|
|
|
return build_type_attribute_variant (t1, attributes);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
case FUNCTION_TYPE:
|
|
|
|
|
|
/* Function types: prefer the one that specified arg types.
|
|
|
|
|
|
If both do, merge the arg types. Also merge the return types. */
|
|
|
|
|
|
{
|
2004-06-06 17:21:59 +02:00
|
|
|
|
tree valtype = composite_type (TREE_TYPE (t1), TREE_TYPE (t2));
|
1992-02-28 19:53:39 +01:00
|
|
|
|
tree p1 = TYPE_ARG_TYPES (t1);
|
|
|
|
|
|
tree p2 = TYPE_ARG_TYPES (t2);
|
|
|
|
|
|
int len;
|
|
|
|
|
|
tree newargs, n;
|
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
|
|
/* Save space: see if the result is identical to one of the args. */
|
|
|
|
|
|
if (valtype == TREE_TYPE (t1) && ! TYPE_ARG_TYPES (t2))
|
1994-05-07 00:29:58 +02:00
|
|
|
|
return build_type_attribute_variant (t1, attributes);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
if (valtype == TREE_TYPE (t2) && ! TYPE_ARG_TYPES (t1))
|
1994-05-07 00:29:58 +02:00
|
|
|
|
return build_type_attribute_variant (t2, attributes);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
|
|
|
|
|
/* Simple way if one arg fails to specify argument types. */
|
|
|
|
|
|
if (TYPE_ARG_TYPES (t1) == 0)
|
1994-05-07 00:29:58 +02:00
|
|
|
|
{
|
2004-06-23 19:05:45 +02:00
|
|
|
|
t1 = build_function_type (valtype, TYPE_ARG_TYPES (t2));
|
|
|
|
|
|
t1 = build_type_attribute_variant (t1, attributes);
|
|
|
|
|
|
return qualify_type (t1, t2);
|
1994-05-07 00:29:58 +02:00
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
if (TYPE_ARG_TYPES (t2) == 0)
|
1994-05-07 00:29:58 +02:00
|
|
|
|
{
|
|
|
|
|
|
t1 = build_function_type (valtype, TYPE_ARG_TYPES (t1));
|
2004-06-23 19:05:45 +02:00
|
|
|
|
t1 = build_type_attribute_variant (t1, attributes);
|
|
|
|
|
|
return qualify_type (t1, t2);
|
1994-05-07 00:29:58 +02:00
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
|
|
|
|
|
/* If both args specify argument types, we must merge the two
|
|
|
|
|
|
lists, argument by argument. */
|
PR 12267, 12391, 12560, 13129, 14114, 14113
* c-tree.h: Forward declare struct c_binding. Declare
c_override_bindings_to_false. Update prototypes.
(struct lang_identifier): Update comments. Change fields to be
struct c_binding *.
(IDENTIFIER_SYMBOL_VALUE, IDENTIFIER_TAG_VALUE)
(IDENTIFIER_LABEL_VALUE, C_DECL_INVISIBLE)
(KEEP_NO, KEEP_YES, KEEP_MAYBE): Delete.
(C_DECL_IN_EXTERNAL_SCOPE, C_DECL_DECLARED_BUILTIN): New.
* c-common.h: Update prototypes.
* c-decl.c (struct c_scope): Update commentary. Remove names,
names_last, parms, parms_last, tags, and shadowed fields. Add
bindings and depth fields.
(scope_freelist): Move to more appropriate location.
(c_print_identifier): Update for changes to struct lang_identifier.
(objc_mark_locals_volatile): Update for new bindings structures.
(global_bindings_p): Honor c_override_global_bindings_to_false.
(pushlevel): Rename to push_scope; take no arguments; use the
scope_freelist; initialize scope->depth and check for overflow.
(poplevel): Rename to pop_scope; totally rewritten for new bindings
structures.
(diagnose_mismatched_decls): Use C_DECL_DECLARED_BUILTIN, not
C_DECL_INVISIBLE, for certain decisions. Adjust some diagnostics.
Improve some commentary. Adjust handling of forward parm decls.
(merge_decls): Set C_DECL_DECLARED_BUILTIN when appropriate.
Preserve C_DECL_IN_EXTERNAL_SCOPE.
(warn_if_shadowing): Correct indentation. Improve diagnostics.
(pushdecl): Remove unnecessary assertion. Short-circuit anonymous
decls. Rewrite for new bindings structures. Improve commentary.
Eliminate the copy_node call.
(implicit_decl_warning): Use the "diag" idiom (as seen in
locate_old_decl) to reduce code duplication; call locate_old_decl
if appropriate. Relocate to remove need for forward declaration.
(implicitly_declare): Adjust for new bindings structures. Kludge
around Objective-C not-really-builtin functions.
(undeclared_variable): Improve diagnostics. If current_function_decl
is nonnull but current_function_scope is null, use current_scope.
Use bind.
(lookup_tag): Adjust for new bindings structures. Kludge around
Objective-C's tag declarations that wind up in the external scope.
(lookup_name): Adjust for new bindings structures. Kludge around
c-common.c's pseudo-typedefs that wind up in the external scope.
(lookup_name_current_level): Rename lookup_name_in_scope; take a
second argument indicating the scope to examine; rewrite for
new bindings structures.
(c_init_decl_processing): Adjust for renamed functions. Do not
initialize current_file_decl, first_builtin_decl, last_builtin_decl.
First scope pushed is the external scope, not the global scope.
(builtin_function): Use bind, not pushdecl. Adjust other bits
for new data structures. Keep track of builtins that should be
made visible automatically.
(start_decl): Adjust diagnostics. Remove unnecessary call to
expand_decl.
(grokparms): Return 0 if arg_types is error_mark_node.
(get_parm_info): Rename "void_at_end" argument to "ellipsis", with
reversed sense. Rewrite for new bindings structures. Do not
leave any decls in the scope, to prevent pop_scope from doing
contradictory things with them.
(finish_struct, finish_enum): Remove redundant diagnostics.
(build_enumerator): Don't cascade diagnostics for error_mark_node.
Mark location where -pedantic changes the meaning of the program.
(store_parm_decls_newstyle, store_parm_decls_oldstyle): Load the
parameter decls into the function's scope structure using bind.
Warn here about function definitions in the wrong style.
Adjust diagnostics.
(store_parm_decls): Correct the determination of whether a
function was defined with a prototype.
(c_write_global_declarations): Operate on all file decls and on
the external scope. Split body of the loop to...
(c_write_global_declarations_1): ... this new function, to avoid
code duplication.
(truly_local_externals, first_builtin_decl, last_builtin_decl)
(make_scope, pop_scope, in_parm_level_p, set_block)
(any_external_decl, record_external_decl, bind_label, getdecls)
(link_hash_hash, link_hash_eq, merge_translation_unit_decls)
(c_reset_state): Delete.
(visible_builtins, c_override_global_bindings_to_false)
(c_binding, I_SYMBOL_BINDING, I_SYMBOL_DECL, I_TAG_BINDING)
(I_TAG_DECL, I_LABEL_BINDING, I_LABEL_DECL, file_scope)
(external_scope, binding_freelist, bind, free_binding_and_advance)
(push_file_scope, pop_file_scope): New.
(pushtag, pushdecl_top_level, lookup_label, declare_label)
(define_label, c_make_fname_decl, finish_decl)
(mark_forward_parm_decls, build_compound_literal)
(grokdeclarator, start_function, check_for_loop_decls)
(identifier_global_value, record_builtin_type): Minor adjustments
for new bindings structures. Improve diagnostics and commentary.
* c-objc-common.c (start_cdtor, finish_cdtor): Adjust calls to
pushlevel/poplevel respectively.
(c_objc_common_finish_file): Don't call merge_translation_unit_decls.
* c-opts.c (c_common_parse_file): Remove spurious ATTRIBUTE_UNUSED.
Warn about YYDEBUG not being defined only if -dy. Remove no-longer-
correct loop over multiple translation units; call fatal_error if
requested to compile more than one file at once. (This disables
IMA temporarily - an up-front error being preferable to a crash.)
* c-parse.in (pushlevel, poplevel rules): Rename push_scope, pop_scope.
(all actions): Adjust calls to pushlevel/poplevel.
(parsing_iso_function_signature): Delete.
(extdef_1): Fold into extdef.
(old_style_parm_decls_1): Fold into old_style_parm_decls. Don't
warn here about function definitions in the wrong style.
(after_tyle_declarator, parm_declarator_starttypename)
(parm_declarator_nostarttypename, notype_declarator): Remove
commented-out productions.
(parmlist_1, parmlist_2): Use make_node, not tree_cons, to create
an empty TREE_LIST node. Adjust calls to get_parm_info.
(parmlist_2 : ELLIPSIS): Tag the arg-info block with error_mark_node
to suppress -Wold-style-definition after this error.
(c_parse_file): Don't clear the binding stack or call
finish_fname_decls here. Correct comment.
* c-typeck.c (same_translation_unit_p): Export.
(common_type): Use c_override_global_bindings_to_false, not
pushlevel/poplevel/declare_parm_level.
* c-lang.c: Override LANG_HOOKS_CLEAR_BINDING_STACK,
LANG_HOOKS_PUSHLEVEL, LANG_HOOKS_POPLEVEL, LANG_HOOKS_SET_BLOCK,
and LANG_HOOKS_GETDECLS with do-nothing stubs.
* objc/objc-lang.c: Likewise.
* objc/objc-act.c: Adjust all calls to pushlevel, poplevel,
get_parm_info.
(OBJC_VOID_AT_END): Delete; replace all uses
with void_list_node.
(generate_forward_declaration_to_string_table): Delete.
* objc/objc-act.h (OCTI_STRG_DECL, UOBJC_STRINGS_decl): Delete.
* coverage.c (create_coverage): Don't pushdecl anything.
* langhooks.c (lhd_clear_binding_stack): Call
lang_hooks.decls.poplevel, not poplevel.
* tree.c (list_length): If ENABLE_TREE_CHECKING, abort on a
circular list rather than going into an infinite loop.
cp:
* cp-lang.c (c_reset_state): Delete.
(push_file_scope, pop_file_scope): New stubs.
* parser.c (c_parse_file): Call sorry() here if called more than once.
testsuite:
* gcc.dg/Wold-style-definition-1.c, gcc.dg/builtins-30.c
* gcc.dg/unused-4.c, gcc.dg/noncompile/label-1.c
* gcc.dg/noncompile/label-lineno-1.c, objc.dg/naming-1.m:
Adjust error regexps.
* gcc.dg/Wshadow-2.c, gcc.dg/noncompile/incomplete-3.c
* gcc.dg/noncompile/undeclared-1.c: New test cases.
* gcc.dg/decl-5.c, gcc.dg/redecl-1.c: Remove XFAIL.
* gcc.dg/local1.c: Add explanatory comment.
From-SVN: r79883
2004-03-24 00:47:53 +01:00
|
|
|
|
/* Tell global_bindings_p to return false so that variable_size
|
|
|
|
|
|
doesn't abort on VLAs in parameter types. */
|
|
|
|
|
|
c_override_global_bindings_to_false = true;
|
2001-02-05 23:14:07 +01:00
|
|
|
|
|
1992-02-28 19:53:39 +01:00
|
|
|
|
len = list_length (p1);
|
|
|
|
|
|
newargs = 0;
|
|
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < len; i++)
|
1992-07-07 00:35:53 +02:00
|
|
|
|
newargs = tree_cons (NULL_TREE, NULL_TREE, newargs);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
|
|
|
|
|
n = newargs;
|
|
|
|
|
|
|
|
|
|
|
|
for (; p1;
|
|
|
|
|
|
p1 = TREE_CHAIN (p1), p2 = TREE_CHAIN (p2), n = TREE_CHAIN (n))
|
|
|
|
|
|
{
|
|
|
|
|
|
/* A null type means arg type is not specified.
|
|
|
|
|
|
Take whatever the other function type has. */
|
|
|
|
|
|
if (TREE_VALUE (p1) == 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
TREE_VALUE (n) = TREE_VALUE (p2);
|
|
|
|
|
|
goto parm_done;
|
|
|
|
|
|
}
|
|
|
|
|
|
if (TREE_VALUE (p2) == 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
TREE_VALUE (n) = TREE_VALUE (p1);
|
|
|
|
|
|
goto parm_done;
|
|
|
|
|
|
}
|
2003-06-22 15:41:26 +02:00
|
|
|
|
|
1992-02-28 19:53:39 +01:00
|
|
|
|
/* Given wait (union {union wait *u; int *i} *)
|
|
|
|
|
|
and wait (union wait *),
|
|
|
|
|
|
prefer union wait * as type of parm. */
|
|
|
|
|
|
if (TREE_CODE (TREE_VALUE (p1)) == UNION_TYPE
|
|
|
|
|
|
&& TREE_VALUE (p1) != TREE_VALUE (p2))
|
|
|
|
|
|
{
|
|
|
|
|
|
tree memb;
|
|
|
|
|
|
for (memb = TYPE_FIELDS (TREE_VALUE (p1));
|
|
|
|
|
|
memb; memb = TREE_CHAIN (memb))
|
2004-06-13 19:14:09 +02:00
|
|
|
|
if (comptypes (TREE_TYPE (memb), TREE_VALUE (p2)))
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
|
|
|
|
|
TREE_VALUE (n) = TREE_VALUE (p2);
|
|
|
|
|
|
if (pedantic)
|
c-common.c (combine_strings, [...]): Refer to ISO C or ISO C89 instead of ANSI C.
* c-common.c (combine_strings, check_format_info): Refer to ISO C
or ISO C89 instead of ANSI C.
* c-decl.c (grokdeclarator, xref_tag, finish_struct,
build_enumerator, do_case): Likewise.
* c-lex.c (parse_float, yylex): Likewise.
* c-parse.in: Likewise.
* c-typeck.c (common_type, build_array_ref, build_binary_op,
build_unary_op, pedantic_lvalue_warning, build_conditional_expr,
build_c_cast, convert_for_assignment, set_init_index,
set_init_label, c_expand_start_case): Likewise.
* toplev.c (documented_lang_options, display_help): Likewise.
From-SVN: r35576
2000-08-09 01:19:11 +02:00
|
|
|
|
pedwarn ("function types not truly compatible in ISO C");
|
1992-02-28 19:53:39 +01:00
|
|
|
|
goto parm_done;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
if (TREE_CODE (TREE_VALUE (p2)) == UNION_TYPE
|
|
|
|
|
|
&& TREE_VALUE (p2) != TREE_VALUE (p1))
|
|
|
|
|
|
{
|
|
|
|
|
|
tree memb;
|
|
|
|
|
|
for (memb = TYPE_FIELDS (TREE_VALUE (p2));
|
|
|
|
|
|
memb; memb = TREE_CHAIN (memb))
|
2004-06-13 19:14:09 +02:00
|
|
|
|
if (comptypes (TREE_TYPE (memb), TREE_VALUE (p1)))
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
|
|
|
|
|
TREE_VALUE (n) = TREE_VALUE (p1);
|
|
|
|
|
|
if (pedantic)
|
c-common.c (combine_strings, [...]): Refer to ISO C or ISO C89 instead of ANSI C.
* c-common.c (combine_strings, check_format_info): Refer to ISO C
or ISO C89 instead of ANSI C.
* c-decl.c (grokdeclarator, xref_tag, finish_struct,
build_enumerator, do_case): Likewise.
* c-lex.c (parse_float, yylex): Likewise.
* c-parse.in: Likewise.
* c-typeck.c (common_type, build_array_ref, build_binary_op,
build_unary_op, pedantic_lvalue_warning, build_conditional_expr,
build_c_cast, convert_for_assignment, set_init_index,
set_init_label, c_expand_start_case): Likewise.
* toplev.c (documented_lang_options, display_help): Likewise.
From-SVN: r35576
2000-08-09 01:19:11 +02:00
|
|
|
|
pedwarn ("function types not truly compatible in ISO C");
|
1992-02-28 19:53:39 +01:00
|
|
|
|
goto parm_done;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
2004-06-06 17:21:59 +02:00
|
|
|
|
TREE_VALUE (n) = composite_type (TREE_VALUE (p1), TREE_VALUE (p2));
|
1992-02-28 19:53:39 +01:00
|
|
|
|
parm_done: ;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
PR 12267, 12391, 12560, 13129, 14114, 14113
* c-tree.h: Forward declare struct c_binding. Declare
c_override_bindings_to_false. Update prototypes.
(struct lang_identifier): Update comments. Change fields to be
struct c_binding *.
(IDENTIFIER_SYMBOL_VALUE, IDENTIFIER_TAG_VALUE)
(IDENTIFIER_LABEL_VALUE, C_DECL_INVISIBLE)
(KEEP_NO, KEEP_YES, KEEP_MAYBE): Delete.
(C_DECL_IN_EXTERNAL_SCOPE, C_DECL_DECLARED_BUILTIN): New.
* c-common.h: Update prototypes.
* c-decl.c (struct c_scope): Update commentary. Remove names,
names_last, parms, parms_last, tags, and shadowed fields. Add
bindings and depth fields.
(scope_freelist): Move to more appropriate location.
(c_print_identifier): Update for changes to struct lang_identifier.
(objc_mark_locals_volatile): Update for new bindings structures.
(global_bindings_p): Honor c_override_global_bindings_to_false.
(pushlevel): Rename to push_scope; take no arguments; use the
scope_freelist; initialize scope->depth and check for overflow.
(poplevel): Rename to pop_scope; totally rewritten for new bindings
structures.
(diagnose_mismatched_decls): Use C_DECL_DECLARED_BUILTIN, not
C_DECL_INVISIBLE, for certain decisions. Adjust some diagnostics.
Improve some commentary. Adjust handling of forward parm decls.
(merge_decls): Set C_DECL_DECLARED_BUILTIN when appropriate.
Preserve C_DECL_IN_EXTERNAL_SCOPE.
(warn_if_shadowing): Correct indentation. Improve diagnostics.
(pushdecl): Remove unnecessary assertion. Short-circuit anonymous
decls. Rewrite for new bindings structures. Improve commentary.
Eliminate the copy_node call.
(implicit_decl_warning): Use the "diag" idiom (as seen in
locate_old_decl) to reduce code duplication; call locate_old_decl
if appropriate. Relocate to remove need for forward declaration.
(implicitly_declare): Adjust for new bindings structures. Kludge
around Objective-C not-really-builtin functions.
(undeclared_variable): Improve diagnostics. If current_function_decl
is nonnull but current_function_scope is null, use current_scope.
Use bind.
(lookup_tag): Adjust for new bindings structures. Kludge around
Objective-C's tag declarations that wind up in the external scope.
(lookup_name): Adjust for new bindings structures. Kludge around
c-common.c's pseudo-typedefs that wind up in the external scope.
(lookup_name_current_level): Rename lookup_name_in_scope; take a
second argument indicating the scope to examine; rewrite for
new bindings structures.
(c_init_decl_processing): Adjust for renamed functions. Do not
initialize current_file_decl, first_builtin_decl, last_builtin_decl.
First scope pushed is the external scope, not the global scope.
(builtin_function): Use bind, not pushdecl. Adjust other bits
for new data structures. Keep track of builtins that should be
made visible automatically.
(start_decl): Adjust diagnostics. Remove unnecessary call to
expand_decl.
(grokparms): Return 0 if arg_types is error_mark_node.
(get_parm_info): Rename "void_at_end" argument to "ellipsis", with
reversed sense. Rewrite for new bindings structures. Do not
leave any decls in the scope, to prevent pop_scope from doing
contradictory things with them.
(finish_struct, finish_enum): Remove redundant diagnostics.
(build_enumerator): Don't cascade diagnostics for error_mark_node.
Mark location where -pedantic changes the meaning of the program.
(store_parm_decls_newstyle, store_parm_decls_oldstyle): Load the
parameter decls into the function's scope structure using bind.
Warn here about function definitions in the wrong style.
Adjust diagnostics.
(store_parm_decls): Correct the determination of whether a
function was defined with a prototype.
(c_write_global_declarations): Operate on all file decls and on
the external scope. Split body of the loop to...
(c_write_global_declarations_1): ... this new function, to avoid
code duplication.
(truly_local_externals, first_builtin_decl, last_builtin_decl)
(make_scope, pop_scope, in_parm_level_p, set_block)
(any_external_decl, record_external_decl, bind_label, getdecls)
(link_hash_hash, link_hash_eq, merge_translation_unit_decls)
(c_reset_state): Delete.
(visible_builtins, c_override_global_bindings_to_false)
(c_binding, I_SYMBOL_BINDING, I_SYMBOL_DECL, I_TAG_BINDING)
(I_TAG_DECL, I_LABEL_BINDING, I_LABEL_DECL, file_scope)
(external_scope, binding_freelist, bind, free_binding_and_advance)
(push_file_scope, pop_file_scope): New.
(pushtag, pushdecl_top_level, lookup_label, declare_label)
(define_label, c_make_fname_decl, finish_decl)
(mark_forward_parm_decls, build_compound_literal)
(grokdeclarator, start_function, check_for_loop_decls)
(identifier_global_value, record_builtin_type): Minor adjustments
for new bindings structures. Improve diagnostics and commentary.
* c-objc-common.c (start_cdtor, finish_cdtor): Adjust calls to
pushlevel/poplevel respectively.
(c_objc_common_finish_file): Don't call merge_translation_unit_decls.
* c-opts.c (c_common_parse_file): Remove spurious ATTRIBUTE_UNUSED.
Warn about YYDEBUG not being defined only if -dy. Remove no-longer-
correct loop over multiple translation units; call fatal_error if
requested to compile more than one file at once. (This disables
IMA temporarily - an up-front error being preferable to a crash.)
* c-parse.in (pushlevel, poplevel rules): Rename push_scope, pop_scope.
(all actions): Adjust calls to pushlevel/poplevel.
(parsing_iso_function_signature): Delete.
(extdef_1): Fold into extdef.
(old_style_parm_decls_1): Fold into old_style_parm_decls. Don't
warn here about function definitions in the wrong style.
(after_tyle_declarator, parm_declarator_starttypename)
(parm_declarator_nostarttypename, notype_declarator): Remove
commented-out productions.
(parmlist_1, parmlist_2): Use make_node, not tree_cons, to create
an empty TREE_LIST node. Adjust calls to get_parm_info.
(parmlist_2 : ELLIPSIS): Tag the arg-info block with error_mark_node
to suppress -Wold-style-definition after this error.
(c_parse_file): Don't clear the binding stack or call
finish_fname_decls here. Correct comment.
* c-typeck.c (same_translation_unit_p): Export.
(common_type): Use c_override_global_bindings_to_false, not
pushlevel/poplevel/declare_parm_level.
* c-lang.c: Override LANG_HOOKS_CLEAR_BINDING_STACK,
LANG_HOOKS_PUSHLEVEL, LANG_HOOKS_POPLEVEL, LANG_HOOKS_SET_BLOCK,
and LANG_HOOKS_GETDECLS with do-nothing stubs.
* objc/objc-lang.c: Likewise.
* objc/objc-act.c: Adjust all calls to pushlevel, poplevel,
get_parm_info.
(OBJC_VOID_AT_END): Delete; replace all uses
with void_list_node.
(generate_forward_declaration_to_string_table): Delete.
* objc/objc-act.h (OCTI_STRG_DECL, UOBJC_STRINGS_decl): Delete.
* coverage.c (create_coverage): Don't pushdecl anything.
* langhooks.c (lhd_clear_binding_stack): Call
lang_hooks.decls.poplevel, not poplevel.
* tree.c (list_length): If ENABLE_TREE_CHECKING, abort on a
circular list rather than going into an infinite loop.
cp:
* cp-lang.c (c_reset_state): Delete.
(push_file_scope, pop_file_scope): New stubs.
* parser.c (c_parse_file): Call sorry() here if called more than once.
testsuite:
* gcc.dg/Wold-style-definition-1.c, gcc.dg/builtins-30.c
* gcc.dg/unused-4.c, gcc.dg/noncompile/label-1.c
* gcc.dg/noncompile/label-lineno-1.c, objc.dg/naming-1.m:
Adjust error regexps.
* gcc.dg/Wshadow-2.c, gcc.dg/noncompile/incomplete-3.c
* gcc.dg/noncompile/undeclared-1.c: New test cases.
* gcc.dg/decl-5.c, gcc.dg/redecl-1.c: Remove XFAIL.
* gcc.dg/local1.c: Add explanatory comment.
From-SVN: r79883
2004-03-24 00:47:53 +01:00
|
|
|
|
c_override_global_bindings_to_false = false;
|
1994-05-07 00:29:58 +02:00
|
|
|
|
t1 = build_function_type (valtype, newargs);
|
2004-06-23 19:05:45 +02:00
|
|
|
|
t1 = qualify_type (t1, t2);
|
1996-07-04 00:07:53 +02:00
|
|
|
|
/* ... falls through ... */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
default:
|
1994-05-07 00:29:58 +02:00
|
|
|
|
return build_type_attribute_variant (t1, attributes);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
2004-06-06 17:21:59 +02:00
|
|
|
|
|
|
|
|
|
|
/* Return the type of a conditional expression between pointers to
|
|
|
|
|
|
possibly differently qualified versions of compatible types.
|
|
|
|
|
|
|
|
|
|
|
|
We assume that comp_target_types has already been done and returned
|
|
|
|
|
|
nonzero; if that isn't so, this may crash. */
|
|
|
|
|
|
|
|
|
|
|
|
static tree
|
|
|
|
|
|
common_pointer_type (tree t1, tree t2)
|
|
|
|
|
|
{
|
|
|
|
|
|
tree attributes;
|
|
|
|
|
|
tree pointed_to_1;
|
|
|
|
|
|
tree pointed_to_2;
|
|
|
|
|
|
tree target;
|
|
|
|
|
|
|
|
|
|
|
|
/* Save time if the two types are the same. */
|
|
|
|
|
|
|
|
|
|
|
|
if (t1 == t2) return t1;
|
|
|
|
|
|
|
|
|
|
|
|
/* If one type is nonsense, use the other. */
|
|
|
|
|
|
if (t1 == error_mark_node)
|
|
|
|
|
|
return t2;
|
|
|
|
|
|
if (t2 == error_mark_node)
|
|
|
|
|
|
return t1;
|
|
|
|
|
|
|
|
|
|
|
|
if (TREE_CODE (t1) != POINTER_TYPE || TREE_CODE (t2) != POINTER_TYPE)
|
|
|
|
|
|
abort ();
|
|
|
|
|
|
|
|
|
|
|
|
/* Merge the attributes. */
|
|
|
|
|
|
attributes = targetm.merge_type_attributes (t1, t2);
|
|
|
|
|
|
|
|
|
|
|
|
/* Find the composite type of the target types, and combine the
|
|
|
|
|
|
qualifiers of the two types' targets. */
|
|
|
|
|
|
pointed_to_1 = TREE_TYPE (t1);
|
|
|
|
|
|
pointed_to_2 = TREE_TYPE (t2);
|
|
|
|
|
|
target = composite_type (TYPE_MAIN_VARIANT (pointed_to_1),
|
|
|
|
|
|
TYPE_MAIN_VARIANT (pointed_to_2));
|
|
|
|
|
|
t1 = build_pointer_type (c_build_qualified_type
|
|
|
|
|
|
(target,
|
|
|
|
|
|
TYPE_QUALS (pointed_to_1) |
|
|
|
|
|
|
TYPE_QUALS (pointed_to_2)));
|
|
|
|
|
|
return build_type_attribute_variant (t1, attributes);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Return the common type for two arithmetic types under the usual
|
|
|
|
|
|
arithmetic conversions. The default conversions have already been
|
|
|
|
|
|
applied, and enumerated types converted to their compatible integer
|
|
|
|
|
|
types. The resulting type is unqualified and has no attributes.
|
|
|
|
|
|
|
|
|
|
|
|
This is the type for the result of most arithmetic operations
|
|
|
|
|
|
if the operands have the given two types. */
|
|
|
|
|
|
|
|
|
|
|
|
tree
|
|
|
|
|
|
common_type (tree t1, tree t2)
|
|
|
|
|
|
{
|
|
|
|
|
|
enum tree_code code1;
|
|
|
|
|
|
enum tree_code code2;
|
|
|
|
|
|
|
|
|
|
|
|
/* If one type is nonsense, use the other. */
|
|
|
|
|
|
if (t1 == error_mark_node)
|
|
|
|
|
|
return t2;
|
|
|
|
|
|
if (t2 == error_mark_node)
|
|
|
|
|
|
return t1;
|
|
|
|
|
|
|
|
|
|
|
|
if (TYPE_QUALS (t1) != TYPE_UNQUALIFIED)
|
|
|
|
|
|
t1 = TYPE_MAIN_VARIANT (t1);
|
|
|
|
|
|
|
|
|
|
|
|
if (TYPE_QUALS (t2) != TYPE_UNQUALIFIED)
|
|
|
|
|
|
t2 = TYPE_MAIN_VARIANT (t2);
|
|
|
|
|
|
|
|
|
|
|
|
if (TYPE_ATTRIBUTES (t1) != NULL_TREE)
|
|
|
|
|
|
t1 = build_type_attribute_variant (t1, NULL_TREE);
|
|
|
|
|
|
|
|
|
|
|
|
if (TYPE_ATTRIBUTES (t2) != NULL_TREE)
|
|
|
|
|
|
t2 = build_type_attribute_variant (t2, NULL_TREE);
|
|
|
|
|
|
|
|
|
|
|
|
/* Save time if the two types are the same. */
|
|
|
|
|
|
|
|
|
|
|
|
if (t1 == t2) return t1;
|
|
|
|
|
|
|
|
|
|
|
|
code1 = TREE_CODE (t1);
|
|
|
|
|
|
code2 = TREE_CODE (t2);
|
|
|
|
|
|
|
|
|
|
|
|
if (code1 != VECTOR_TYPE && code1 != COMPLEX_TYPE
|
|
|
|
|
|
&& code1 != REAL_TYPE && code1 != INTEGER_TYPE)
|
|
|
|
|
|
abort ();
|
|
|
|
|
|
|
|
|
|
|
|
if (code2 != VECTOR_TYPE && code2 != COMPLEX_TYPE
|
|
|
|
|
|
&& code2 != REAL_TYPE && code2 != INTEGER_TYPE)
|
|
|
|
|
|
abort ();
|
|
|
|
|
|
|
|
|
|
|
|
/* If one type is a vector type, return that type. (How the usual
|
|
|
|
|
|
arithmetic conversions apply to the vector types extension is not
|
|
|
|
|
|
precisely specified.) */
|
|
|
|
|
|
if (code1 == VECTOR_TYPE)
|
|
|
|
|
|
return t1;
|
|
|
|
|
|
|
|
|
|
|
|
if (code2 == VECTOR_TYPE)
|
|
|
|
|
|
return t2;
|
|
|
|
|
|
|
|
|
|
|
|
/* If one type is complex, form the common type of the non-complex
|
|
|
|
|
|
components, then make that complex. Use T1 or T2 if it is the
|
|
|
|
|
|
required type. */
|
|
|
|
|
|
if (code1 == COMPLEX_TYPE || code2 == COMPLEX_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
tree subtype1 = code1 == COMPLEX_TYPE ? TREE_TYPE (t1) : t1;
|
|
|
|
|
|
tree subtype2 = code2 == COMPLEX_TYPE ? TREE_TYPE (t2) : t2;
|
|
|
|
|
|
tree subtype = common_type (subtype1, subtype2);
|
|
|
|
|
|
|
|
|
|
|
|
if (code1 == COMPLEX_TYPE && TREE_TYPE (t1) == subtype)
|
|
|
|
|
|
return t1;
|
|
|
|
|
|
else if (code2 == COMPLEX_TYPE && TREE_TYPE (t2) == subtype)
|
|
|
|
|
|
return t2;
|
|
|
|
|
|
else
|
|
|
|
|
|
return build_complex_type (subtype);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* If only one is real, use it as the result. */
|
|
|
|
|
|
|
|
|
|
|
|
if (code1 == REAL_TYPE && code2 != REAL_TYPE)
|
|
|
|
|
|
return t1;
|
|
|
|
|
|
|
|
|
|
|
|
if (code2 == REAL_TYPE && code1 != REAL_TYPE)
|
|
|
|
|
|
return t2;
|
|
|
|
|
|
|
|
|
|
|
|
/* Both real or both integers; use the one with greater precision. */
|
|
|
|
|
|
|
|
|
|
|
|
if (TYPE_PRECISION (t1) > TYPE_PRECISION (t2))
|
|
|
|
|
|
return t1;
|
|
|
|
|
|
else if (TYPE_PRECISION (t2) > TYPE_PRECISION (t1))
|
|
|
|
|
|
return t2;
|
|
|
|
|
|
|
|
|
|
|
|
/* Same precision. Prefer long longs to longs to ints when the
|
|
|
|
|
|
same precision, following the C99 rules on integer type rank
|
|
|
|
|
|
(which are equivalent to the C90 rules for C90 types). */
|
|
|
|
|
|
|
|
|
|
|
|
if (TYPE_MAIN_VARIANT (t1) == long_long_unsigned_type_node
|
|
|
|
|
|
|| TYPE_MAIN_VARIANT (t2) == long_long_unsigned_type_node)
|
|
|
|
|
|
return long_long_unsigned_type_node;
|
|
|
|
|
|
|
|
|
|
|
|
if (TYPE_MAIN_VARIANT (t1) == long_long_integer_type_node
|
|
|
|
|
|
|| TYPE_MAIN_VARIANT (t2) == long_long_integer_type_node)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (TYPE_UNSIGNED (t1) || TYPE_UNSIGNED (t2))
|
|
|
|
|
|
return long_long_unsigned_type_node;
|
|
|
|
|
|
else
|
|
|
|
|
|
return long_long_integer_type_node;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (TYPE_MAIN_VARIANT (t1) == long_unsigned_type_node
|
|
|
|
|
|
|| TYPE_MAIN_VARIANT (t2) == long_unsigned_type_node)
|
|
|
|
|
|
return long_unsigned_type_node;
|
|
|
|
|
|
|
|
|
|
|
|
if (TYPE_MAIN_VARIANT (t1) == long_integer_type_node
|
|
|
|
|
|
|| TYPE_MAIN_VARIANT (t2) == long_integer_type_node)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* But preserve unsignedness from the other type,
|
|
|
|
|
|
since long cannot hold all the values of an unsigned int. */
|
|
|
|
|
|
if (TYPE_UNSIGNED (t1) || TYPE_UNSIGNED (t2))
|
|
|
|
|
|
return long_unsigned_type_node;
|
|
|
|
|
|
else
|
|
|
|
|
|
return long_integer_type_node;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Likewise, prefer long double to double even if same size. */
|
|
|
|
|
|
if (TYPE_MAIN_VARIANT (t1) == long_double_type_node
|
|
|
|
|
|
|| TYPE_MAIN_VARIANT (t2) == long_double_type_node)
|
|
|
|
|
|
return long_double_type_node;
|
|
|
|
|
|
|
|
|
|
|
|
/* Otherwise prefer the unsigned one. */
|
|
|
|
|
|
|
|
|
|
|
|
if (TYPE_UNSIGNED (t1))
|
|
|
|
|
|
return t1;
|
|
|
|
|
|
else
|
|
|
|
|
|
return t2;
|
|
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
|
|
|
|
|
/* Return 1 if TYPE1 and TYPE2 are compatible types for assignment
|
|
|
|
|
|
or various other operations. Return 2 if they are compatible
|
|
|
|
|
|
but a warning may be needed if you use them together. */
|
|
|
|
|
|
|
|
|
|
|
|
int
|
2004-06-13 19:14:09 +02:00
|
|
|
|
comptypes (tree type1, tree type2)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2001-10-11 05:16:15 +02:00
|
|
|
|
tree t1 = type1;
|
|
|
|
|
|
tree t2 = type2;
|
1994-05-07 00:29:58 +02:00
|
|
|
|
int attrval, val;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
|
|
|
|
|
/* Suppress errors caused by previously reported errors. */
|
|
|
|
|
|
|
1998-01-13 22:40:27 +01:00
|
|
|
|
if (t1 == t2 || !t1 || !t2
|
|
|
|
|
|
|| TREE_CODE (t1) == ERROR_MARK || TREE_CODE (t2) == ERROR_MARK)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
return 1;
|
|
|
|
|
|
|
2000-03-02 19:29:56 +01:00
|
|
|
|
/* If either type is the internal version of sizetype, return the
|
|
|
|
|
|
language version. */
|
|
|
|
|
|
if (TREE_CODE (t1) == INTEGER_TYPE && TYPE_IS_SIZETYPE (t1)
|
2004-03-26 20:02:55 +01:00
|
|
|
|
&& TYPE_ORIG_SIZE_TYPE (t1))
|
|
|
|
|
|
t1 = TYPE_ORIG_SIZE_TYPE (t1);
|
2000-03-02 19:29:56 +01:00
|
|
|
|
|
|
|
|
|
|
if (TREE_CODE (t2) == INTEGER_TYPE && TYPE_IS_SIZETYPE (t2)
|
2004-03-26 20:02:55 +01:00
|
|
|
|
&& TYPE_ORIG_SIZE_TYPE (t2))
|
|
|
|
|
|
t2 = TYPE_ORIG_SIZE_TYPE (t2);
|
|
|
|
|
|
|
2000-03-02 19:29:56 +01:00
|
|
|
|
|
2004-01-07 23:24:44 +01:00
|
|
|
|
/* Enumerated types are compatible with integer types, but this is
|
|
|
|
|
|
not transitive: two enumerated types in the same translation unit
|
|
|
|
|
|
are compatible with each other only if they are the same type. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2004-01-07 23:24:44 +01:00
|
|
|
|
if (TREE_CODE (t1) == ENUMERAL_TYPE && TREE_CODE (t2) != ENUMERAL_TYPE)
|
builtins.c, [...]: Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* builtins.c, c-aux-info.c, c-common.c, c-cppbuiltin.c, c-decl.c:
Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* c-format.c, c-opts.c, c-pretty-print.c, c-typeck.c: Likewise.
* calls.c, convert.c, dbxout.c, dojump.c, dwarf2out.c: Likewise.
* expmed.c, expr.c, fold-const.c, function.c, integrate.c: Likewise.
* optabs.c, sdbout.c, stmt.c, stor-layout.c, tree-dump.c: Likewise.
* tree.c, config/iq2000/iq2000.c, config/m32r/m32r.c: Likewise.
* config/mips/mips.c, config/rs6000/rs6000.c: Likewise.
* config/s390/s390.c, config/sparc/sparc.c, objc/objc-act.c: Likewise.
* stor-layout.c (layout_type, case COMPLEX_TYPE): Test for
REAL_TYPE, not INTEGER_TYPE.
(layout_type, case VECTOR_TYPE): Simplify code.
* tree.c (build_vector_type_for_mode): Remove dup unsigned setting.
* tree.h: Update comments.
(STRIP_NOPS): Use TYPE_UNSIGNED.
(TYPE_UNSIGNED): New macro.
(TYPE_TRAP_SIGNED): Remove now redundant check.
(SAVE_EXPR_NOPLACEHOLDER): Don't use TREE_UNSIGNED.
* cp/call.c (joust): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* cp/class.c (check_bitfield_decl): Likewise.
* cp/cvt.c (type_promotes_to): Likewise.
* cp/decl.c (finish_enum): Likewise.
* cp/mangle.c (write_builtin_type): Likewise.
* cp/semantics.c (finish_switch_cond, finish_unary_op_expr): Likewise.
* cp/typeck.c (type_after_usual_arithmetic_conversions): Likewise.
(build_binary_op): Likewise.
* f/com.c (ffecom_arrayref_): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
(ffecom_expr_): Likewise.
* java/jcf-write.c (generate_bytecode_insns): Use TYPE_UNSIGNED.
* treelang/treetree.c (tree_lang_signed_or_unsigned_type):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/decl.c (gnat_to_gnu_entity, make_type_from_size):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/trans.c (tree_transform, convert_with_check): Likewise.
* ada/utils.c (gnat_signed_or_unsigned_type): Likewise.
(build_vms_descriptor, unchecked_convert): Likewise.
* ada/utils2.c (nonbinary_modular_operation): Likewise.
From-SVN: r80287
2004-04-01 05:50:43 +02:00
|
|
|
|
t1 = c_common_type_for_size (TYPE_PRECISION (t1), TYPE_UNSIGNED (t1));
|
2004-01-07 23:24:44 +01:00
|
|
|
|
else if (TREE_CODE (t2) == ENUMERAL_TYPE && TREE_CODE (t1) != ENUMERAL_TYPE)
|
builtins.c, [...]: Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* builtins.c, c-aux-info.c, c-common.c, c-cppbuiltin.c, c-decl.c:
Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* c-format.c, c-opts.c, c-pretty-print.c, c-typeck.c: Likewise.
* calls.c, convert.c, dbxout.c, dojump.c, dwarf2out.c: Likewise.
* expmed.c, expr.c, fold-const.c, function.c, integrate.c: Likewise.
* optabs.c, sdbout.c, stmt.c, stor-layout.c, tree-dump.c: Likewise.
* tree.c, config/iq2000/iq2000.c, config/m32r/m32r.c: Likewise.
* config/mips/mips.c, config/rs6000/rs6000.c: Likewise.
* config/s390/s390.c, config/sparc/sparc.c, objc/objc-act.c: Likewise.
* stor-layout.c (layout_type, case COMPLEX_TYPE): Test for
REAL_TYPE, not INTEGER_TYPE.
(layout_type, case VECTOR_TYPE): Simplify code.
* tree.c (build_vector_type_for_mode): Remove dup unsigned setting.
* tree.h: Update comments.
(STRIP_NOPS): Use TYPE_UNSIGNED.
(TYPE_UNSIGNED): New macro.
(TYPE_TRAP_SIGNED): Remove now redundant check.
(SAVE_EXPR_NOPLACEHOLDER): Don't use TREE_UNSIGNED.
* cp/call.c (joust): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* cp/class.c (check_bitfield_decl): Likewise.
* cp/cvt.c (type_promotes_to): Likewise.
* cp/decl.c (finish_enum): Likewise.
* cp/mangle.c (write_builtin_type): Likewise.
* cp/semantics.c (finish_switch_cond, finish_unary_op_expr): Likewise.
* cp/typeck.c (type_after_usual_arithmetic_conversions): Likewise.
(build_binary_op): Likewise.
* f/com.c (ffecom_arrayref_): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
(ffecom_expr_): Likewise.
* java/jcf-write.c (generate_bytecode_insns): Use TYPE_UNSIGNED.
* treelang/treetree.c (tree_lang_signed_or_unsigned_type):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/decl.c (gnat_to_gnu_entity, make_type_from_size):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/trans.c (tree_transform, convert_with_check): Likewise.
* ada/utils.c (gnat_signed_or_unsigned_type): Likewise.
(build_vms_descriptor, unchecked_convert): Likewise.
* ada/utils2.c (nonbinary_modular_operation): Likewise.
From-SVN: r80287
2004-04-01 05:50:43 +02:00
|
|
|
|
t2 = c_common_type_for_size (TYPE_PRECISION (t2), TYPE_UNSIGNED (t2));
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
|
|
|
|
|
if (t1 == t2)
|
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
|
|
/* Different classes of types can't be compatible. */
|
|
|
|
|
|
|
2004-06-02 21:46:13 +02:00
|
|
|
|
if (TREE_CODE (t1) != TREE_CODE (t2))
|
|
|
|
|
|
return 0;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2004-06-13 18:24:52 +02:00
|
|
|
|
/* Qualifiers must match. C99 6.7.3p9 */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
invoke.texi: Document -flang-isoc9x.
* invoke.texi: Document -flang-isoc9x.
* Makefile.in (OBJS): Add splay-tree.o.
(c-common.o): Depend on rtl.h.
(splay-tree.o): List dependencies and provide build rule.
* rtl.h (record_alias_subset): New function.
* alias.c: Include splay-tree.h.
(alias_set_entry): New type.
(CHECK_ALIAS_SETS_FOR_CONSISTENCY): Remove.
(DIFFERENT_ALIAS_SETS_P): Use mem_in_disjoint_alias_sets_p.
(mems_in_disjoin_alias_sets_p): New function.
(alias_set_compare): Likewise.
(insert_subset_children): Likewise.
(get_alias_set_entry): Likewise.
* tree.h (TYPE_RESTRICT): New macro.
(TYPE_UNQUALIFIED): New manifest constant.
(TYPE_QUAL_CONST): Likewise
(TYPE_QUAL_VOLATILE): Likewise.
(TYPE_QUAL_RESTRICT): Likewise.
(tree_type): Add restrict_flag. Reduce count of free bits.
(DECL_POINTER_ALIAS_SET): New macro.
(DECL_POINTER_ALIAS_SET_KNOWN_P): Likewise.
(tree_decl): Add pointer_alias_set.
(build_qualified_type): New function.
(build_type_variant): Define in terms of build_qualified_type.
* tree.c (set_type_quals): New function.
(make_node): Initializae DECL_POINTER_ALIAS_SET.
(build_type_attribute_variant): Use build_qualified_type and
set_type_quals.
(build_type_variant): Rename, and modify, to become...
(build_qualified_type): New function.
(build_complex_type): Use set_type_quals.
* c-tree.h (C_TYPE_OBJECT_P): New macro.
(C_TYPE_FUNCTION_P): Likewise.
(C_TYPE_INCOMPLETE_P): Likewise.
(C_TYPE_OBJECT_OR_INCOMPLETE_P): Likewise.
(c_apply_type_quals_to_decl): New function.
(c_build_qualified_type): New function.
(c_build_type_variant): Define in terms of c_build_qualified_type.
(flag_isoc9x): Declare.
* c-typeck.c (qualify_type): Use c_build_qualified_type.
(common_type): Change to use TYPE_QUALS.
(comptypes): Likewise.
(convert_for_assignment): Likewise.
* c-aux-info.c (gen_type): Likewise. Deal with `restrict'.
* c-decl.c (flag_isoc9x): Define.
(c_decode_option): Handle -flang-isoc9x.
(grokdeclarator): Update to handle restrict. Use TYPE_QUALS,
c_build_qualified_type, etc. Use c_apply_type_quals_to_decl.
* c-lex.c (init_lex): Deal with restrict.
(init_lex): Don't treat restrict as a reserved word in
-traditional mode, or without -flang-isoc9x.
* c-lex.h (rid): Add RID_RESTRICT.
* c-parse.gperf (restrict, __restrict, __restrict__): Make
equivalent to RID_RESTRICT.
* c-parse.in (TYPE_QUAL): Update comment.
* c-common.c: Include rtl.h.
(c_find_base_decl): New function.
(c_build_type_variant): Rename, and modify, to become ...
(c_build_qualified_type): New function.
(c_apply_type_quals_to_decl): Likewise.
(c_get_alias_set): For INDIRECT_REFs, check to see if we can find
a particular alias set for the reference.
* toplev.c (documented_lang_options): Add -flang-isoc9x.
From-SVN: r23212
1998-10-21 11:53:40 +02:00
|
|
|
|
if (TYPE_QUALS (t1) != TYPE_QUALS (t2))
|
1992-02-28 19:53:39 +01:00
|
|
|
|
return 0;
|
|
|
|
|
|
|
1993-04-14 19:29:55 +02:00
|
|
|
|
/* Allow for two different type nodes which have essentially the same
|
|
|
|
|
|
definition. Note that we already checked for equality of the type
|
1998-05-06 23:09:07 +02:00
|
|
|
|
qualifiers (just above). */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
|
|
|
|
|
if (TYPE_MAIN_VARIANT (t1) == TYPE_MAIN_VARIANT (t2))
|
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
1994-05-07 00:29:58 +02:00
|
|
|
|
/* 1 if no need for warning yet, 2 if warning cause has been seen. */
|
alias.c, [...]: Replace calls via (*targetm.foo) () with targetm.foo ().
* alias.c, attribs.c, bt-load.c, builtins.c, c-common.c,
c-decl.c, c-objc-common.c, c-typeck.c, calls.c, cfglayout.c,
cse.c, dbxout.c, dwarf2out.c, except.c, final.c,
haifa-sched.c, integrate.c, passes.c, rtlanal.c, sched-rgn.c,
sched-vis.c, simplify-rtx.c, stor-layout.c, tree.c, varasm.c,
vmsdbgout.c: Replace calls via (*targetm.foo) () with
targetm.foo ().
From-SVN: r79729
2004-03-20 05:52:59 +01:00
|
|
|
|
if (! (attrval = targetm.comp_type_attributes (t1, t2)))
|
1994-05-07 00:29:58 +02:00
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
|
|
/* 1 if no need for warning yet, 2 if warning cause has been seen. */
|
|
|
|
|
|
val = 0;
|
|
|
|
|
|
|
1992-02-28 19:53:39 +01:00
|
|
|
|
switch (TREE_CODE (t1))
|
|
|
|
|
|
{
|
|
|
|
|
|
case POINTER_TYPE:
|
2003-09-25 03:26:01 +02:00
|
|
|
|
/* We must give ObjC the first crack at comparing pointers, since
|
|
|
|
|
|
protocol qualifiers may be involved. */
|
|
|
|
|
|
if (c_dialect_objc () && (val = objc_comptypes (t1, t2, 0)) >= 0)
|
|
|
|
|
|
break;
|
1994-05-07 00:29:58 +02:00
|
|
|
|
val = (TREE_TYPE (t1) == TREE_TYPE (t2)
|
2004-06-13 19:14:09 +02:00
|
|
|
|
? 1 : comptypes (TREE_TYPE (t1), TREE_TYPE (t2)));
|
1994-05-07 00:29:58 +02:00
|
|
|
|
break;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
|
|
|
|
|
case FUNCTION_TYPE:
|
2004-06-13 19:14:09 +02:00
|
|
|
|
val = function_types_compatible_p (t1, t2);
|
1994-05-07 00:29:58 +02:00
|
|
|
|
break;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
|
|
|
|
|
case ARRAY_TYPE:
|
|
|
|
|
|
{
|
|
|
|
|
|
tree d1 = TYPE_DOMAIN (t1);
|
|
|
|
|
|
tree d2 = TYPE_DOMAIN (t2);
|
2001-09-16 02:48:52 +02:00
|
|
|
|
bool d1_variable, d2_variable;
|
|
|
|
|
|
bool d1_zero, d2_zero;
|
1994-05-07 00:29:58 +02:00
|
|
|
|
val = 1;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
|
|
|
|
|
/* Target types must match incl. qualifiers. */
|
|
|
|
|
|
if (TREE_TYPE (t1) != TREE_TYPE (t2)
|
2004-06-13 19:14:09 +02:00
|
|
|
|
&& 0 == (val = comptypes (TREE_TYPE (t1), TREE_TYPE (t2))))
|
1992-02-28 19:53:39 +01:00
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
|
|
/* Sizes must match unless one is missing or variable. */
|
2001-09-16 02:48:52 +02:00
|
|
|
|
if (d1 == 0 || d2 == 0 || d1 == d2)
|
1994-05-07 00:29:58 +02:00
|
|
|
|
break;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2001-09-16 02:48:52 +02:00
|
|
|
|
d1_zero = ! TYPE_MAX_VALUE (d1);
|
|
|
|
|
|
d2_zero = ! TYPE_MAX_VALUE (d2);
|
|
|
|
|
|
|
|
|
|
|
|
d1_variable = (! d1_zero
|
|
|
|
|
|
&& (TREE_CODE (TYPE_MIN_VALUE (d1)) != INTEGER_CST
|
|
|
|
|
|
|| TREE_CODE (TYPE_MAX_VALUE (d1)) != INTEGER_CST));
|
|
|
|
|
|
d2_variable = (! d2_zero
|
|
|
|
|
|
&& (TREE_CODE (TYPE_MIN_VALUE (d2)) != INTEGER_CST
|
|
|
|
|
|
|| TREE_CODE (TYPE_MAX_VALUE (d2)) != INTEGER_CST));
|
|
|
|
|
|
|
|
|
|
|
|
if (d1_variable || d2_variable)
|
|
|
|
|
|
break;
|
|
|
|
|
|
if (d1_zero && d2_zero)
|
|
|
|
|
|
break;
|
|
|
|
|
|
if (d1_zero || d2_zero
|
|
|
|
|
|
|| ! tree_int_cst_equal (TYPE_MIN_VALUE (d1), TYPE_MIN_VALUE (d2))
|
tree.h (INT_CST_LT, [...]): Remove unneeded casts.
* tree.h (INT_CST_LT, INT_CST_LT_UNSIGNED): Remove unneeded casts.
(struct tree_int_cst): int_cst_low is now unsigned HOST_WIDE_INT.
(attribute_hash_list, type_hash_canon): hashcode is now unsigned.
(type_hash_lookup, type_hash_add, type_hash_list): Likewise.
(min_precision): Result is unsignd.
(add_double, neg_double, mul_double): Low word is unsigned.
(lshift_double, rshift_double, lrotate_double): Likewise.
(rrotate_double, div_and_round_double): Likewise.
(tree_floor_log2, compare_tree_int): New functions.
(preserve_rtl_expr_temps): New declaration.
* c-common.c (declare_hidden_char_array): Use compare_tree_int.
(decl_attributes): Use tree_log2 to find alignment.
Check for TREE_INT_CST_HIGH for format args.
(min_precision): Now unsigned.
Use tree_floor_log2.
(truthvalue_conversion): Delete long-disabled code.
* c-decl.c (finish_struct): Clean up tests on field width.
(finish_function): Use compare_tree_int.
* c-pragma.c (handle_pragma_token): Use tree_log2 for alignment.
* c-typeck.c (comptypes): Use tree_int_cst_equal.
(default_conversion, digest_init): Use compare_tree_int.
(build_binary_op): Use integer_all_onesp and compare_tree_int.
Fix type errors in forming masks.
* calls.c (initialize_argument_information): Use compare_tree_int.
* dbxout.c (dbxout_type): Cast TREE_INT_CST_LOW to HOST_WIDE_INT.
* except.c (expand_eh_region_start_tree): Use compare_tree_int.
* expr.c (is_zeros_p, case INTEGER_CST): Use integer_zerop.
(store_field): Use compare_tree_int.
(expand_expr, case CONSTRUCTOR): Use TYPE_SIZE_UNIT.
(expand_expr, case ARRAY_REF): Use compare_tree_int.
(do_jump, case BIT_AND_EXPR): Use tree_floor_log2.
(do_store_flag): Use compare_tree_int.
* fold-const.c (encode, decode): Low part is always unsigned.
(force_fit_type, add_double, neg_double, mul_double): Likewise.
(lshift_double, rshift_double, lrotate_double): Likewise.
(rrotate_double, div_and_round_double, int_const_binop): Likewise.
(fold_convert): Use compare_tree_int.
(operand_equal_p, case INTEGER_CST): Use tree_int_cst_equal.
(invert_truthvalue, case INTEGER_CST): Likewise.
(fold): Use compare_tree_int; add casts for unsigned TREE_INT_CST_LOW.
* mkdeps.c (deps_dummy_targets): Make I unsigned.
* rtl.h (add_double, neg_double, mul_double): Low words are unsigned.
(lshift_double, rshift_double, lrotate_double, rrotate_double):
Likewise.
* stmt.c (expand_decl): Use compare_tree_int and mode_for_size_tree.
(expand_end_case): Use compare_tree_int.
(estimate_case_costs): Cast TREE_INT_CST_LOW to HOST_WIDE_INT.
* stor-layout.c (mode_for_size_tree): Use compare_tree_int.
(layout_decl): Likewise.
(layout_record, layout_union): Make sizes unsigned.
(layout_type, case VOID_TYPE): TYPE_SIZE must be bitsizetype.
(layout_type, case QUAL_UNION_TYPE): Use compare_tree_int.
* tree.c (struct type_hash): hashcode is unsigned.
(build_type_attribute_variant, type_hash_list): Likewise.
(type_hash_lookup, type_hash_add, type_hash_canon): Likewise.
(attribute_hash_list, build_array_type, build_method_type): Likewise.
(build_complex_type): Likewise.
(real_value_from_int_cst): Remove unneeded casts.
(integer_all_onesp): Add casts.
(tree_floor_log2, compare_tree_int): New functions.
(build_index_type): Use tree_int_cst_sgn.
* varasm.c (assemble_variable): Use compare_tree_int.
* ch/actions.c (chill_convert_for_assignment): INDEX is unsigned
HOST_WIDE_INT.
* ch/ch-tree.h (DECL_NESTING_LEVEL): Use TREE_INT_CST_HIGH
since unsigned.
* ch/except.c (chill_handle_on_labels): ALTERNATIVE is unsigned.
Use compare_tree_int.
(expand_goto_except_cleanup): Likewise.
* cp/class.c (dfs_modify_vtables): I is now unsigned.
(check_bitfield_decl): Use tree_int_cst_sgn and compare_tree_int.
(build_base_field): Add casts of TREE_INT_CST_LOW to HOST_WIDE_INT.
* cp/error.c (dump_expr): Cast TREE_INT_CST_HIGH to unsigned.
* cp/init.c (build_vec_init): Cast TREE_INT_CST_LOW to HOST_WIDE_INT.
* cp/method.c (build_overload_int): Cast TREE_INT_CST_HIGH to unsigned.
* cp/typeck.c (build_binary_op, case TRUNC_DIV_EXPR):
Call integer_all_onesp.
* cp/typeck2.c (process_init_constructor): Use compare_tree_int.
* f/com.c (ffecom_f2c_set_lio_code_): Use compare_tree_int.
(ffecom_sym_transform_, ffecom_transform_common_): Likewise.
(ffecom_transform_equiv_): Likewise.
* java/decl.c (emit_init_test_initialization): Mark KEY as unused.
* java/expr.c (build_newarray): Cast TREE_INT_CST_LOW to HOST_WIDE_INT.
(build_anewarray): Likewise.
* java/parse.y (patch_newarray): Likewise.
* java/parse.c: Regenerated.
From-SVN: r32383
2000-03-07 12:41:32 +01:00
|
|
|
|
|| ! tree_int_cst_equal (TYPE_MAX_VALUE (d1), TYPE_MAX_VALUE (d2)))
|
|
|
|
|
|
val = 0;
|
|
|
|
|
|
|
1994-05-07 00:29:58 +02:00
|
|
|
|
break;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
case RECORD_TYPE:
|
2003-09-25 03:26:01 +02:00
|
|
|
|
/* We are dealing with two distinct structs. In assorted Objective-C
|
|
|
|
|
|
corner cases, however, these can still be deemed equivalent. */
|
c-common.c (enum c_language_kind, flag_objc): Remove.
* c-common.c (enum c_language_kind, flag_objc): Remove.
(fix_string_type, check_case_value, c_common_nodes_and_builtins,
c_add_case_label, finish_label_addr_expr, boolean_increment):
Use c_dialect_ macros.
* c-common.h (enum c_language_kind): Extend.
(c_dialect_cxx, c_dialect_objc): New.
(flag_objc): Remove.
(c_common_init_options): Update prototype.
* c-cppbuiltin.c (define__GNUC__, c_cpp_builtins): Use c_dialect_
macros.
* c-decl.c (finsih_decl, grokfield, finish_struct): Use c_dialect_
macros.
* c-format.c (C_STD_VER, C_STD_NAME): Similarly.
* c-lang.c (c_init_options): Remove.
(c_language): Define.
(LANG_HOOKS_INIT_OPTIONS): Use common hook.
* c-lex.c (lex_charconst): Use c_dialect_cxx().
* c-opts.c (lang_flags): Make function-local.
(c_common_init_options): Use c_dialect_ macros. Handle
C++ diagnostic requirements.
(c_common_handle_option, c_common_post_options): Use flag_cxx.
* c-parse.in (init_reswords): Use c_dialect_objc ().
* c-pch.c (get_ident): Use c_language.
* c-pretty-print.c (pp_c_bool_literal): Use c_dialect_ macros.
* c-typeck.c (comptypes, build_c_cast): Similarly.
* objc/objc-lang.c (c_language): Define.
(LANG_HOOKS_INIT_OPTIONS): Use common hook.
(objc_init_options): Remove.
cp:
* Make-lang.in: Update.
* cp-lang.c (c_language): Define.
(LANG_HOOKS_INIT_OPTIONS): Use common hook.
* cp-tree.h (cxx_init_options): Remove.
* lex.c: Don't include diagnostic.h.
(cxx_init_options): Remove.
From-SVN: r68734
2003-06-30 21:36:25 +02:00
|
|
|
|
if (c_dialect_objc () && objc_comptypes (t1, t2, 0) == 1)
|
1994-05-07 00:29:58 +02:00
|
|
|
|
val = 1;
|
2003-07-11 10:33:21 +02:00
|
|
|
|
|
|
|
|
|
|
case ENUMERAL_TYPE:
|
|
|
|
|
|
case UNION_TYPE:
|
2003-08-30 23:24:19 +02:00
|
|
|
|
if (val != 1 && !same_translation_unit_p (t1, t2))
|
2004-06-13 19:14:09 +02:00
|
|
|
|
val = tagged_types_tu_compatible_p (t1, t2);
|
1994-05-07 00:29:58 +02:00
|
|
|
|
break;
|
1997-11-02 22:19:36 +01:00
|
|
|
|
|
2003-02-19 01:51:16 +01:00
|
|
|
|
case VECTOR_TYPE:
|
2004-05-05 09:23:00 +02:00
|
|
|
|
val = TYPE_VECTOR_SUBPARTS (t1) == TYPE_VECTOR_SUBPARTS (t2)
|
2004-06-13 19:14:09 +02:00
|
|
|
|
&& comptypes (TREE_TYPE (t1), TREE_TYPE (t2));
|
2003-02-19 01:51:16 +01:00
|
|
|
|
break;
|
|
|
|
|
|
|
1997-11-02 22:19:36 +01:00
|
|
|
|
default:
|
|
|
|
|
|
break;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
1994-05-07 00:29:58 +02:00
|
|
|
|
return attrval == 2 && val == 1 ? 2 : val;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Return 1 if TTL and TTR are pointers to types that are equivalent,
|
2002-09-17 15:59:30 +02:00
|
|
|
|
ignoring their qualifiers. REFLEXIVE is only used by ObjC - set it
|
|
|
|
|
|
to 1 or 0 depending if the check of the pointer types is meant to
|
|
|
|
|
|
be reflexive or not (typically, assignments are not reflexive,
|
|
|
|
|
|
while comparisons are reflexive).
|
|
|
|
|
|
*/
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
|
|
|
|
|
static int
|
2003-06-22 15:41:26 +02:00
|
|
|
|
comp_target_types (tree ttl, tree ttr, int reflexive)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
1993-04-22 13:48:29 +02:00
|
|
|
|
int val;
|
1993-04-10 01:11:51 +02:00
|
|
|
|
|
2002-09-03 18:40:29 +02:00
|
|
|
|
/* Give objc_comptypes a crack at letting these types through. */
|
2002-09-17 15:59:30 +02:00
|
|
|
|
if ((val = objc_comptypes (ttl, ttr, reflexive)) >= 0)
|
1993-04-22 13:48:29 +02:00
|
|
|
|
return val;
|
1993-04-10 01:11:51 +02:00
|
|
|
|
|
1993-04-22 13:48:29 +02:00
|
|
|
|
val = comptypes (TYPE_MAIN_VARIANT (TREE_TYPE (ttl)),
|
2004-06-13 19:14:09 +02:00
|
|
|
|
TYPE_MAIN_VARIANT (TREE_TYPE (ttr)));
|
1993-04-10 01:11:51 +02:00
|
|
|
|
|
1992-02-28 19:53:39 +01:00
|
|
|
|
if (val == 2 && pedantic)
|
|
|
|
|
|
pedwarn ("types are not quite compatible");
|
|
|
|
|
|
return val;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Subroutines of `comptypes'. */
|
|
|
|
|
|
|
PR 12267, 12391, 12560, 13129, 14114, 14113
* c-tree.h: Forward declare struct c_binding. Declare
c_override_bindings_to_false. Update prototypes.
(struct lang_identifier): Update comments. Change fields to be
struct c_binding *.
(IDENTIFIER_SYMBOL_VALUE, IDENTIFIER_TAG_VALUE)
(IDENTIFIER_LABEL_VALUE, C_DECL_INVISIBLE)
(KEEP_NO, KEEP_YES, KEEP_MAYBE): Delete.
(C_DECL_IN_EXTERNAL_SCOPE, C_DECL_DECLARED_BUILTIN): New.
* c-common.h: Update prototypes.
* c-decl.c (struct c_scope): Update commentary. Remove names,
names_last, parms, parms_last, tags, and shadowed fields. Add
bindings and depth fields.
(scope_freelist): Move to more appropriate location.
(c_print_identifier): Update for changes to struct lang_identifier.
(objc_mark_locals_volatile): Update for new bindings structures.
(global_bindings_p): Honor c_override_global_bindings_to_false.
(pushlevel): Rename to push_scope; take no arguments; use the
scope_freelist; initialize scope->depth and check for overflow.
(poplevel): Rename to pop_scope; totally rewritten for new bindings
structures.
(diagnose_mismatched_decls): Use C_DECL_DECLARED_BUILTIN, not
C_DECL_INVISIBLE, for certain decisions. Adjust some diagnostics.
Improve some commentary. Adjust handling of forward parm decls.
(merge_decls): Set C_DECL_DECLARED_BUILTIN when appropriate.
Preserve C_DECL_IN_EXTERNAL_SCOPE.
(warn_if_shadowing): Correct indentation. Improve diagnostics.
(pushdecl): Remove unnecessary assertion. Short-circuit anonymous
decls. Rewrite for new bindings structures. Improve commentary.
Eliminate the copy_node call.
(implicit_decl_warning): Use the "diag" idiom (as seen in
locate_old_decl) to reduce code duplication; call locate_old_decl
if appropriate. Relocate to remove need for forward declaration.
(implicitly_declare): Adjust for new bindings structures. Kludge
around Objective-C not-really-builtin functions.
(undeclared_variable): Improve diagnostics. If current_function_decl
is nonnull but current_function_scope is null, use current_scope.
Use bind.
(lookup_tag): Adjust for new bindings structures. Kludge around
Objective-C's tag declarations that wind up in the external scope.
(lookup_name): Adjust for new bindings structures. Kludge around
c-common.c's pseudo-typedefs that wind up in the external scope.
(lookup_name_current_level): Rename lookup_name_in_scope; take a
second argument indicating the scope to examine; rewrite for
new bindings structures.
(c_init_decl_processing): Adjust for renamed functions. Do not
initialize current_file_decl, first_builtin_decl, last_builtin_decl.
First scope pushed is the external scope, not the global scope.
(builtin_function): Use bind, not pushdecl. Adjust other bits
for new data structures. Keep track of builtins that should be
made visible automatically.
(start_decl): Adjust diagnostics. Remove unnecessary call to
expand_decl.
(grokparms): Return 0 if arg_types is error_mark_node.
(get_parm_info): Rename "void_at_end" argument to "ellipsis", with
reversed sense. Rewrite for new bindings structures. Do not
leave any decls in the scope, to prevent pop_scope from doing
contradictory things with them.
(finish_struct, finish_enum): Remove redundant diagnostics.
(build_enumerator): Don't cascade diagnostics for error_mark_node.
Mark location where -pedantic changes the meaning of the program.
(store_parm_decls_newstyle, store_parm_decls_oldstyle): Load the
parameter decls into the function's scope structure using bind.
Warn here about function definitions in the wrong style.
Adjust diagnostics.
(store_parm_decls): Correct the determination of whether a
function was defined with a prototype.
(c_write_global_declarations): Operate on all file decls and on
the external scope. Split body of the loop to...
(c_write_global_declarations_1): ... this new function, to avoid
code duplication.
(truly_local_externals, first_builtin_decl, last_builtin_decl)
(make_scope, pop_scope, in_parm_level_p, set_block)
(any_external_decl, record_external_decl, bind_label, getdecls)
(link_hash_hash, link_hash_eq, merge_translation_unit_decls)
(c_reset_state): Delete.
(visible_builtins, c_override_global_bindings_to_false)
(c_binding, I_SYMBOL_BINDING, I_SYMBOL_DECL, I_TAG_BINDING)
(I_TAG_DECL, I_LABEL_BINDING, I_LABEL_DECL, file_scope)
(external_scope, binding_freelist, bind, free_binding_and_advance)
(push_file_scope, pop_file_scope): New.
(pushtag, pushdecl_top_level, lookup_label, declare_label)
(define_label, c_make_fname_decl, finish_decl)
(mark_forward_parm_decls, build_compound_literal)
(grokdeclarator, start_function, check_for_loop_decls)
(identifier_global_value, record_builtin_type): Minor adjustments
for new bindings structures. Improve diagnostics and commentary.
* c-objc-common.c (start_cdtor, finish_cdtor): Adjust calls to
pushlevel/poplevel respectively.
(c_objc_common_finish_file): Don't call merge_translation_unit_decls.
* c-opts.c (c_common_parse_file): Remove spurious ATTRIBUTE_UNUSED.
Warn about YYDEBUG not being defined only if -dy. Remove no-longer-
correct loop over multiple translation units; call fatal_error if
requested to compile more than one file at once. (This disables
IMA temporarily - an up-front error being preferable to a crash.)
* c-parse.in (pushlevel, poplevel rules): Rename push_scope, pop_scope.
(all actions): Adjust calls to pushlevel/poplevel.
(parsing_iso_function_signature): Delete.
(extdef_1): Fold into extdef.
(old_style_parm_decls_1): Fold into old_style_parm_decls. Don't
warn here about function definitions in the wrong style.
(after_tyle_declarator, parm_declarator_starttypename)
(parm_declarator_nostarttypename, notype_declarator): Remove
commented-out productions.
(parmlist_1, parmlist_2): Use make_node, not tree_cons, to create
an empty TREE_LIST node. Adjust calls to get_parm_info.
(parmlist_2 : ELLIPSIS): Tag the arg-info block with error_mark_node
to suppress -Wold-style-definition after this error.
(c_parse_file): Don't clear the binding stack or call
finish_fname_decls here. Correct comment.
* c-typeck.c (same_translation_unit_p): Export.
(common_type): Use c_override_global_bindings_to_false, not
pushlevel/poplevel/declare_parm_level.
* c-lang.c: Override LANG_HOOKS_CLEAR_BINDING_STACK,
LANG_HOOKS_PUSHLEVEL, LANG_HOOKS_POPLEVEL, LANG_HOOKS_SET_BLOCK,
and LANG_HOOKS_GETDECLS with do-nothing stubs.
* objc/objc-lang.c: Likewise.
* objc/objc-act.c: Adjust all calls to pushlevel, poplevel,
get_parm_info.
(OBJC_VOID_AT_END): Delete; replace all uses
with void_list_node.
(generate_forward_declaration_to_string_table): Delete.
* objc/objc-act.h (OCTI_STRG_DECL, UOBJC_STRINGS_decl): Delete.
* coverage.c (create_coverage): Don't pushdecl anything.
* langhooks.c (lhd_clear_binding_stack): Call
lang_hooks.decls.poplevel, not poplevel.
* tree.c (list_length): If ENABLE_TREE_CHECKING, abort on a
circular list rather than going into an infinite loop.
cp:
* cp-lang.c (c_reset_state): Delete.
(push_file_scope, pop_file_scope): New stubs.
* parser.c (c_parse_file): Call sorry() here if called more than once.
testsuite:
* gcc.dg/Wold-style-definition-1.c, gcc.dg/builtins-30.c
* gcc.dg/unused-4.c, gcc.dg/noncompile/label-1.c
* gcc.dg/noncompile/label-lineno-1.c, objc.dg/naming-1.m:
Adjust error regexps.
* gcc.dg/Wshadow-2.c, gcc.dg/noncompile/incomplete-3.c
* gcc.dg/noncompile/undeclared-1.c: New test cases.
* gcc.dg/decl-5.c, gcc.dg/redecl-1.c: Remove XFAIL.
* gcc.dg/local1.c: Add explanatory comment.
From-SVN: r79883
2004-03-24 00:47:53 +01:00
|
|
|
|
/* Determine whether two trees derive from the same translation unit.
|
|
|
|
|
|
If the CONTEXT chain ends in a null, that tree's context is still
|
|
|
|
|
|
being parsed, so if two trees have context chains ending in null,
|
2003-08-30 23:24:19 +02:00
|
|
|
|
they're in the same translation unit. */
|
PR 12267, 12391, 12560, 13129, 14114, 14113
* c-tree.h: Forward declare struct c_binding. Declare
c_override_bindings_to_false. Update prototypes.
(struct lang_identifier): Update comments. Change fields to be
struct c_binding *.
(IDENTIFIER_SYMBOL_VALUE, IDENTIFIER_TAG_VALUE)
(IDENTIFIER_LABEL_VALUE, C_DECL_INVISIBLE)
(KEEP_NO, KEEP_YES, KEEP_MAYBE): Delete.
(C_DECL_IN_EXTERNAL_SCOPE, C_DECL_DECLARED_BUILTIN): New.
* c-common.h: Update prototypes.
* c-decl.c (struct c_scope): Update commentary. Remove names,
names_last, parms, parms_last, tags, and shadowed fields. Add
bindings and depth fields.
(scope_freelist): Move to more appropriate location.
(c_print_identifier): Update for changes to struct lang_identifier.
(objc_mark_locals_volatile): Update for new bindings structures.
(global_bindings_p): Honor c_override_global_bindings_to_false.
(pushlevel): Rename to push_scope; take no arguments; use the
scope_freelist; initialize scope->depth and check for overflow.
(poplevel): Rename to pop_scope; totally rewritten for new bindings
structures.
(diagnose_mismatched_decls): Use C_DECL_DECLARED_BUILTIN, not
C_DECL_INVISIBLE, for certain decisions. Adjust some diagnostics.
Improve some commentary. Adjust handling of forward parm decls.
(merge_decls): Set C_DECL_DECLARED_BUILTIN when appropriate.
Preserve C_DECL_IN_EXTERNAL_SCOPE.
(warn_if_shadowing): Correct indentation. Improve diagnostics.
(pushdecl): Remove unnecessary assertion. Short-circuit anonymous
decls. Rewrite for new bindings structures. Improve commentary.
Eliminate the copy_node call.
(implicit_decl_warning): Use the "diag" idiom (as seen in
locate_old_decl) to reduce code duplication; call locate_old_decl
if appropriate. Relocate to remove need for forward declaration.
(implicitly_declare): Adjust for new bindings structures. Kludge
around Objective-C not-really-builtin functions.
(undeclared_variable): Improve diagnostics. If current_function_decl
is nonnull but current_function_scope is null, use current_scope.
Use bind.
(lookup_tag): Adjust for new bindings structures. Kludge around
Objective-C's tag declarations that wind up in the external scope.
(lookup_name): Adjust for new bindings structures. Kludge around
c-common.c's pseudo-typedefs that wind up in the external scope.
(lookup_name_current_level): Rename lookup_name_in_scope; take a
second argument indicating the scope to examine; rewrite for
new bindings structures.
(c_init_decl_processing): Adjust for renamed functions. Do not
initialize current_file_decl, first_builtin_decl, last_builtin_decl.
First scope pushed is the external scope, not the global scope.
(builtin_function): Use bind, not pushdecl. Adjust other bits
for new data structures. Keep track of builtins that should be
made visible automatically.
(start_decl): Adjust diagnostics. Remove unnecessary call to
expand_decl.
(grokparms): Return 0 if arg_types is error_mark_node.
(get_parm_info): Rename "void_at_end" argument to "ellipsis", with
reversed sense. Rewrite for new bindings structures. Do not
leave any decls in the scope, to prevent pop_scope from doing
contradictory things with them.
(finish_struct, finish_enum): Remove redundant diagnostics.
(build_enumerator): Don't cascade diagnostics for error_mark_node.
Mark location where -pedantic changes the meaning of the program.
(store_parm_decls_newstyle, store_parm_decls_oldstyle): Load the
parameter decls into the function's scope structure using bind.
Warn here about function definitions in the wrong style.
Adjust diagnostics.
(store_parm_decls): Correct the determination of whether a
function was defined with a prototype.
(c_write_global_declarations): Operate on all file decls and on
the external scope. Split body of the loop to...
(c_write_global_declarations_1): ... this new function, to avoid
code duplication.
(truly_local_externals, first_builtin_decl, last_builtin_decl)
(make_scope, pop_scope, in_parm_level_p, set_block)
(any_external_decl, record_external_decl, bind_label, getdecls)
(link_hash_hash, link_hash_eq, merge_translation_unit_decls)
(c_reset_state): Delete.
(visible_builtins, c_override_global_bindings_to_false)
(c_binding, I_SYMBOL_BINDING, I_SYMBOL_DECL, I_TAG_BINDING)
(I_TAG_DECL, I_LABEL_BINDING, I_LABEL_DECL, file_scope)
(external_scope, binding_freelist, bind, free_binding_and_advance)
(push_file_scope, pop_file_scope): New.
(pushtag, pushdecl_top_level, lookup_label, declare_label)
(define_label, c_make_fname_decl, finish_decl)
(mark_forward_parm_decls, build_compound_literal)
(grokdeclarator, start_function, check_for_loop_decls)
(identifier_global_value, record_builtin_type): Minor adjustments
for new bindings structures. Improve diagnostics and commentary.
* c-objc-common.c (start_cdtor, finish_cdtor): Adjust calls to
pushlevel/poplevel respectively.
(c_objc_common_finish_file): Don't call merge_translation_unit_decls.
* c-opts.c (c_common_parse_file): Remove spurious ATTRIBUTE_UNUSED.
Warn about YYDEBUG not being defined only if -dy. Remove no-longer-
correct loop over multiple translation units; call fatal_error if
requested to compile more than one file at once. (This disables
IMA temporarily - an up-front error being preferable to a crash.)
* c-parse.in (pushlevel, poplevel rules): Rename push_scope, pop_scope.
(all actions): Adjust calls to pushlevel/poplevel.
(parsing_iso_function_signature): Delete.
(extdef_1): Fold into extdef.
(old_style_parm_decls_1): Fold into old_style_parm_decls. Don't
warn here about function definitions in the wrong style.
(after_tyle_declarator, parm_declarator_starttypename)
(parm_declarator_nostarttypename, notype_declarator): Remove
commented-out productions.
(parmlist_1, parmlist_2): Use make_node, not tree_cons, to create
an empty TREE_LIST node. Adjust calls to get_parm_info.
(parmlist_2 : ELLIPSIS): Tag the arg-info block with error_mark_node
to suppress -Wold-style-definition after this error.
(c_parse_file): Don't clear the binding stack or call
finish_fname_decls here. Correct comment.
* c-typeck.c (same_translation_unit_p): Export.
(common_type): Use c_override_global_bindings_to_false, not
pushlevel/poplevel/declare_parm_level.
* c-lang.c: Override LANG_HOOKS_CLEAR_BINDING_STACK,
LANG_HOOKS_PUSHLEVEL, LANG_HOOKS_POPLEVEL, LANG_HOOKS_SET_BLOCK,
and LANG_HOOKS_GETDECLS with do-nothing stubs.
* objc/objc-lang.c: Likewise.
* objc/objc-act.c: Adjust all calls to pushlevel, poplevel,
get_parm_info.
(OBJC_VOID_AT_END): Delete; replace all uses
with void_list_node.
(generate_forward_declaration_to_string_table): Delete.
* objc/objc-act.h (OCTI_STRG_DECL, UOBJC_STRINGS_decl): Delete.
* coverage.c (create_coverage): Don't pushdecl anything.
* langhooks.c (lhd_clear_binding_stack): Call
lang_hooks.decls.poplevel, not poplevel.
* tree.c (list_length): If ENABLE_TREE_CHECKING, abort on a
circular list rather than going into an infinite loop.
cp:
* cp-lang.c (c_reset_state): Delete.
(push_file_scope, pop_file_scope): New stubs.
* parser.c (c_parse_file): Call sorry() here if called more than once.
testsuite:
* gcc.dg/Wold-style-definition-1.c, gcc.dg/builtins-30.c
* gcc.dg/unused-4.c, gcc.dg/noncompile/label-1.c
* gcc.dg/noncompile/label-lineno-1.c, objc.dg/naming-1.m:
Adjust error regexps.
* gcc.dg/Wshadow-2.c, gcc.dg/noncompile/incomplete-3.c
* gcc.dg/noncompile/undeclared-1.c: New test cases.
* gcc.dg/decl-5.c, gcc.dg/redecl-1.c: Remove XFAIL.
* gcc.dg/local1.c: Add explanatory comment.
From-SVN: r79883
2004-03-24 00:47:53 +01:00
|
|
|
|
int
|
2003-08-30 23:24:19 +02:00
|
|
|
|
same_translation_unit_p (tree t1, tree t2)
|
|
|
|
|
|
{
|
|
|
|
|
|
while (t1 && TREE_CODE (t1) != TRANSLATION_UNIT_DECL)
|
|
|
|
|
|
switch (TREE_CODE_CLASS (TREE_CODE (t1)))
|
|
|
|
|
|
{
|
|
|
|
|
|
case 'd': t1 = DECL_CONTEXT (t1); break;
|
|
|
|
|
|
case 't': t1 = TYPE_CONTEXT (t1); break;
|
2004-05-14 04:33:00 +02:00
|
|
|
|
case 'x': t1 = BLOCK_SUPERCONTEXT (t1); break; /* assume block */
|
2003-08-30 23:24:19 +02:00
|
|
|
|
default: abort ();
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
while (t2 && TREE_CODE (t2) != TRANSLATION_UNIT_DECL)
|
|
|
|
|
|
switch (TREE_CODE_CLASS (TREE_CODE (t2)))
|
|
|
|
|
|
{
|
2004-03-23 03:24:24 +01:00
|
|
|
|
case 'd': t2 = DECL_CONTEXT (t2); break;
|
2003-08-30 23:24:19 +02:00
|
|
|
|
case 't': t2 = TYPE_CONTEXT (t2); break;
|
2004-05-14 04:33:00 +02:00
|
|
|
|
case 'x': t2 = BLOCK_SUPERCONTEXT (t2); break; /* assume block */
|
2003-08-30 23:24:19 +02:00
|
|
|
|
default: abort ();
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return t1 == t2;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2003-07-11 10:33:21 +02:00
|
|
|
|
/* The C standard says that two structures in different translation
|
|
|
|
|
|
units are compatible with each other only if the types of their
|
|
|
|
|
|
fields are compatible (among other things). So, consider two copies
|
|
|
|
|
|
of this structure: */
|
|
|
|
|
|
|
|
|
|
|
|
struct tagged_tu_seen {
|
|
|
|
|
|
const struct tagged_tu_seen * next;
|
|
|
|
|
|
tree t1;
|
|
|
|
|
|
tree t2;
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/* Can they be compatible with each other? We choose to break the
|
|
|
|
|
|
recursion by allowing those types to be compatible. */
|
|
|
|
|
|
|
|
|
|
|
|
static const struct tagged_tu_seen * tagged_tu_seen_base;
|
|
|
|
|
|
|
|
|
|
|
|
/* Return 1 if two 'struct', 'union', or 'enum' types T1 and T2 are
|
|
|
|
|
|
compatible. If the two types are not the same (which has been
|
|
|
|
|
|
checked earlier), this can only happen when multiple translation
|
|
|
|
|
|
units are being compiled. See C99 6.2.7 paragraph 1 for the exact
|
|
|
|
|
|
rules. */
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
2004-06-13 19:14:09 +02:00
|
|
|
|
tagged_types_tu_compatible_p (tree t1, tree t2)
|
2003-07-11 10:33:21 +02:00
|
|
|
|
{
|
|
|
|
|
|
tree s1, s2;
|
|
|
|
|
|
bool needs_warning = false;
|
2004-06-02 21:46:13 +02:00
|
|
|
|
|
2003-07-11 10:33:21 +02:00
|
|
|
|
/* We have to verify that the tags of the types are the same. This
|
|
|
|
|
|
is harder than it looks because this may be a typedef, so we have
|
|
|
|
|
|
to go look at the original type. It may even be a typedef of a
|
2004-05-13 08:41:07 +02:00
|
|
|
|
typedef...
|
|
|
|
|
|
In the case of compiler-created builtin structs the TYPE_DECL
|
|
|
|
|
|
may be a dummy, with no DECL_ORIGINAL_TYPE. Don't fault. */
|
2004-03-20 21:46:56 +01:00
|
|
|
|
while (TYPE_NAME (t1)
|
|
|
|
|
|
&& TREE_CODE (TYPE_NAME (t1)) == TYPE_DECL
|
|
|
|
|
|
&& DECL_ORIGINAL_TYPE (TYPE_NAME (t1)))
|
2003-07-11 10:33:21 +02:00
|
|
|
|
t1 = DECL_ORIGINAL_TYPE (TYPE_NAME (t1));
|
|
|
|
|
|
|
2004-03-20 21:46:56 +01:00
|
|
|
|
while (TYPE_NAME (t2)
|
|
|
|
|
|
&& TREE_CODE (TYPE_NAME (t2)) == TYPE_DECL
|
|
|
|
|
|
&& DECL_ORIGINAL_TYPE (TYPE_NAME (t2)))
|
2003-07-11 10:33:21 +02:00
|
|
|
|
t2 = DECL_ORIGINAL_TYPE (TYPE_NAME (t2));
|
|
|
|
|
|
|
|
|
|
|
|
/* C90 didn't have the requirement that the two tags be the same. */
|
|
|
|
|
|
if (flag_isoc99 && TYPE_NAME (t1) != TYPE_NAME (t2))
|
|
|
|
|
|
return 0;
|
2004-06-02 21:46:13 +02:00
|
|
|
|
|
2003-07-11 10:33:21 +02:00
|
|
|
|
/* C90 didn't say what happened if one or both of the types were
|
|
|
|
|
|
incomplete; we choose to follow C99 rules here, which is that they
|
|
|
|
|
|
are compatible. */
|
|
|
|
|
|
if (TYPE_SIZE (t1) == NULL
|
|
|
|
|
|
|| TYPE_SIZE (t2) == NULL)
|
|
|
|
|
|
return 1;
|
2004-06-02 21:46:13 +02:00
|
|
|
|
|
2003-07-11 10:33:21 +02:00
|
|
|
|
{
|
|
|
|
|
|
const struct tagged_tu_seen * tts_i;
|
|
|
|
|
|
for (tts_i = tagged_tu_seen_base; tts_i != NULL; tts_i = tts_i->next)
|
|
|
|
|
|
if (tts_i->t1 == t1 && tts_i->t2 == t2)
|
|
|
|
|
|
return 1;
|
|
|
|
|
|
}
|
2004-06-02 21:46:13 +02:00
|
|
|
|
|
2003-07-11 10:33:21 +02:00
|
|
|
|
switch (TREE_CODE (t1))
|
|
|
|
|
|
{
|
|
|
|
|
|
case ENUMERAL_TYPE:
|
|
|
|
|
|
{
|
2004-06-02 21:46:13 +02:00
|
|
|
|
|
c-typeck.c, [...]: Fix comment typos and formatting.
* c-typeck.c, combine.c, cse.c, dominance.c, et-forest.h,
ggc-page.c, var-tracking.c, config/fp-bit.c, config/c4x/c4x.c,
config/cris/cris.c, config/i386/ppro.md, config/i860/i860.c,
config/i860/i860.h, config/m32r/m32r.h, config/m32r/xm-m32r.h,
config/m68hc11/m68hc11.h, config/m68hc11/m68hc11.md,
config/mips/mips.c, config/mmix/mmix.c, config/ns32k/ns32k.h,
config/pa/pa.c, config/pa/pa32-regs.h, config/pa/pa64-regs.h,
config/pdp11/pdp11.h, config/rs6000/rs6000.c,
config/stormy16/stormy16.c: Fix comment typos and formatting.
From-SVN: r79303
2004-03-11 06:54:35 +01:00
|
|
|
|
/* Speed up the case where the type values are in the same order. */
|
2004-02-27 23:33:02 +01:00
|
|
|
|
tree tv1 = TYPE_VALUES (t1);
|
|
|
|
|
|
tree tv2 = TYPE_VALUES (t2);
|
2004-06-02 21:46:13 +02:00
|
|
|
|
|
2004-02-27 23:33:02 +01:00
|
|
|
|
if (tv1 == tv2)
|
|
|
|
|
|
return 1;
|
2004-06-02 21:46:13 +02:00
|
|
|
|
|
2004-03-09 23:24:32 +01:00
|
|
|
|
for (;tv1 && tv2; tv1 = TREE_CHAIN (tv1), tv2 = TREE_CHAIN (tv2))
|
2004-02-27 23:33:02 +01:00
|
|
|
|
{
|
2004-02-29 00:23:30 +01:00
|
|
|
|
if (TREE_PURPOSE (tv1) != TREE_PURPOSE (tv2))
|
2004-02-27 23:33:02 +01:00
|
|
|
|
break;
|
|
|
|
|
|
if (simple_cst_equal (TREE_VALUE (tv1), TREE_VALUE (tv2)) != 1)
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
}
|
2004-06-02 21:46:13 +02:00
|
|
|
|
|
2004-02-27 23:33:02 +01:00
|
|
|
|
if (tv1 == NULL_TREE && tv2 == NULL_TREE)
|
|
|
|
|
|
return 1;
|
|
|
|
|
|
if (tv1 == NULL_TREE || tv2 == NULL_TREE)
|
|
|
|
|
|
return 0;
|
2004-06-02 21:46:13 +02:00
|
|
|
|
|
2003-07-11 10:33:21 +02:00
|
|
|
|
if (list_length (TYPE_VALUES (t1)) != list_length (TYPE_VALUES (t2)))
|
|
|
|
|
|
return 0;
|
2004-06-02 21:46:13 +02:00
|
|
|
|
|
2003-07-11 10:33:21 +02:00
|
|
|
|
for (s1 = TYPE_VALUES (t1); s1; s1 = TREE_CHAIN (s1))
|
|
|
|
|
|
{
|
|
|
|
|
|
s2 = purpose_member (TREE_PURPOSE (s1), TYPE_VALUES (t2));
|
|
|
|
|
|
if (s2 == NULL
|
|
|
|
|
|
|| simple_cst_equal (TREE_VALUE (s1), TREE_VALUE (s2)) != 1)
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
return 1;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
case UNION_TYPE:
|
|
|
|
|
|
{
|
|
|
|
|
|
if (list_length (TYPE_FIELDS (t1)) != list_length (TYPE_FIELDS (t2)))
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
|
|
for (s1 = TYPE_FIELDS (t1); s1; s1 = TREE_CHAIN (s1))
|
|
|
|
|
|
{
|
|
|
|
|
|
bool ok = false;
|
|
|
|
|
|
struct tagged_tu_seen tts;
|
|
|
|
|
|
|
|
|
|
|
|
tts.next = tagged_tu_seen_base;
|
|
|
|
|
|
tts.t1 = t1;
|
|
|
|
|
|
tts.t2 = t2;
|
|
|
|
|
|
tagged_tu_seen_base = &tts;
|
2004-06-02 21:46:13 +02:00
|
|
|
|
|
2003-07-11 10:33:21 +02:00
|
|
|
|
if (DECL_NAME (s1) != NULL)
|
2004-06-18 00:53:13 +02:00
|
|
|
|
for (s2 = TYPE_FIELDS (t2); s2; s2 = TREE_CHAIN (s2))
|
2003-07-11 10:33:21 +02:00
|
|
|
|
if (DECL_NAME (s1) == DECL_NAME (s2))
|
|
|
|
|
|
{
|
|
|
|
|
|
int result;
|
2004-06-13 19:14:09 +02:00
|
|
|
|
result = comptypes (TREE_TYPE (s1), TREE_TYPE (s2));
|
2003-07-11 10:33:21 +02:00
|
|
|
|
if (result == 0)
|
|
|
|
|
|
break;
|
|
|
|
|
|
if (result == 2)
|
|
|
|
|
|
needs_warning = true;
|
2004-06-02 21:46:13 +02:00
|
|
|
|
|
2003-07-11 10:33:21 +02:00
|
|
|
|
if (TREE_CODE (s1) == FIELD_DECL
|
|
|
|
|
|
&& simple_cst_equal (DECL_FIELD_BIT_OFFSET (s1),
|
|
|
|
|
|
DECL_FIELD_BIT_OFFSET (s2)) != 1)
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
ok = true;
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
tagged_tu_seen_base = tts.next;
|
|
|
|
|
|
if (! ok)
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
return needs_warning ? 2 : 1;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
case RECORD_TYPE:
|
|
|
|
|
|
{
|
|
|
|
|
|
struct tagged_tu_seen tts;
|
2004-06-02 21:46:13 +02:00
|
|
|
|
|
2003-07-11 10:33:21 +02:00
|
|
|
|
tts.next = tagged_tu_seen_base;
|
|
|
|
|
|
tts.t1 = t1;
|
|
|
|
|
|
tts.t2 = t2;
|
|
|
|
|
|
tagged_tu_seen_base = &tts;
|
2004-06-02 21:46:13 +02:00
|
|
|
|
|
|
|
|
|
|
for (s1 = TYPE_FIELDS (t1), s2 = TYPE_FIELDS (t2);
|
2003-07-11 10:33:21 +02:00
|
|
|
|
s1 && s2;
|
|
|
|
|
|
s1 = TREE_CHAIN (s1), s2 = TREE_CHAIN (s2))
|
|
|
|
|
|
{
|
|
|
|
|
|
int result;
|
|
|
|
|
|
if (TREE_CODE (s1) != TREE_CODE (s2)
|
|
|
|
|
|
|| DECL_NAME (s1) != DECL_NAME (s2))
|
|
|
|
|
|
break;
|
2004-06-13 19:14:09 +02:00
|
|
|
|
result = comptypes (TREE_TYPE (s1), TREE_TYPE (s2));
|
2003-07-11 10:33:21 +02:00
|
|
|
|
if (result == 0)
|
|
|
|
|
|
break;
|
|
|
|
|
|
if (result == 2)
|
|
|
|
|
|
needs_warning = true;
|
2004-06-02 21:46:13 +02:00
|
|
|
|
|
2003-07-11 10:33:21 +02:00
|
|
|
|
if (TREE_CODE (s1) == FIELD_DECL
|
|
|
|
|
|
&& simple_cst_equal (DECL_FIELD_BIT_OFFSET (s1),
|
|
|
|
|
|
DECL_FIELD_BIT_OFFSET (s2)) != 1)
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
tagged_tu_seen_base = tts.next;
|
|
|
|
|
|
if (s1 && s2)
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
return needs_warning ? 2 : 1;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
|
abort ();
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
1992-02-28 19:53:39 +01:00
|
|
|
|
/* Return 1 if two function types F1 and F2 are compatible.
|
|
|
|
|
|
If either type specifies no argument types,
|
|
|
|
|
|
the other must specify a fixed number of self-promoting arg types.
|
2003-06-22 15:41:26 +02:00
|
|
|
|
Otherwise, if one type specifies only the number of arguments,
|
1992-02-28 19:53:39 +01:00
|
|
|
|
the other must specify that number of self-promoting arg types.
|
|
|
|
|
|
Otherwise, the argument types must match. */
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
2004-06-13 19:14:09 +02:00
|
|
|
|
function_types_compatible_p (tree f1, tree f2)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
|
|
|
|
|
tree args1, args2;
|
|
|
|
|
|
/* 1 if no need for warning yet, 2 if warning cause has been seen. */
|
|
|
|
|
|
int val = 1;
|
|
|
|
|
|
int val1;
|
2003-04-30 03:28:39 +02:00
|
|
|
|
tree ret1, ret2;
|
|
|
|
|
|
|
|
|
|
|
|
ret1 = TREE_TYPE (f1);
|
|
|
|
|
|
ret2 = TREE_TYPE (f2);
|
|
|
|
|
|
|
2004-07-22 02:00:47 +02:00
|
|
|
|
/* 'volatile' qualifiers on a function's return type used to mean
|
|
|
|
|
|
the function is noreturn. */
|
|
|
|
|
|
if (TYPE_VOLATILE (ret1) != TYPE_VOLATILE (ret2))
|
2003-04-30 03:28:39 +02:00
|
|
|
|
pedwarn ("function return types not compatible due to `volatile'");
|
|
|
|
|
|
if (TYPE_VOLATILE (ret1))
|
|
|
|
|
|
ret1 = build_qualified_type (TYPE_MAIN_VARIANT (ret1),
|
|
|
|
|
|
TYPE_QUALS (ret1) & ~TYPE_QUAL_VOLATILE);
|
|
|
|
|
|
if (TYPE_VOLATILE (ret2))
|
|
|
|
|
|
ret2 = build_qualified_type (TYPE_MAIN_VARIANT (ret2),
|
|
|
|
|
|
TYPE_QUALS (ret2) & ~TYPE_QUAL_VOLATILE);
|
2004-06-13 19:14:09 +02:00
|
|
|
|
val = comptypes (ret1, ret2);
|
2003-04-30 03:28:39 +02:00
|
|
|
|
if (val == 0)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
|
|
args1 = TYPE_ARG_TYPES (f1);
|
|
|
|
|
|
args2 = TYPE_ARG_TYPES (f2);
|
|
|
|
|
|
|
|
|
|
|
|
/* An unspecified parmlist matches any specified parmlist
|
|
|
|
|
|
whose argument types don't need default promotions. */
|
|
|
|
|
|
|
|
|
|
|
|
if (args1 == 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (!self_promoting_args_p (args2))
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
/* If one of these types comes from a non-prototype fn definition,
|
|
|
|
|
|
compare that with the other type's arglist.
|
|
|
|
|
|
If they don't match, ask for a warning (but no error). */
|
|
|
|
|
|
if (TYPE_ACTUAL_ARG_TYPES (f1)
|
2004-06-13 19:14:09 +02:00
|
|
|
|
&& 1 != type_lists_compatible_p (args2, TYPE_ACTUAL_ARG_TYPES (f1)))
|
1992-02-28 19:53:39 +01:00
|
|
|
|
val = 2;
|
|
|
|
|
|
return val;
|
|
|
|
|
|
}
|
|
|
|
|
|
if (args2 == 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (!self_promoting_args_p (args1))
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
if (TYPE_ACTUAL_ARG_TYPES (f2)
|
2004-06-13 19:14:09 +02:00
|
|
|
|
&& 1 != type_lists_compatible_p (args1, TYPE_ACTUAL_ARG_TYPES (f2)))
|
1992-02-28 19:53:39 +01:00
|
|
|
|
val = 2;
|
|
|
|
|
|
return val;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Both types have argument lists: compare them and propagate results. */
|
2004-06-13 19:14:09 +02:00
|
|
|
|
val1 = type_lists_compatible_p (args1, args2);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
return val1 != 1 ? val1 : val;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Check two lists of types for compatibility,
|
|
|
|
|
|
returning 0 for incompatible, 1 for compatible,
|
|
|
|
|
|
or 2 for compatible with warning. */
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
2004-06-13 19:14:09 +02:00
|
|
|
|
type_lists_compatible_p (tree args1, tree args2)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
|
|
|
|
|
/* 1 if no need for warning yet, 2 if warning cause has been seen. */
|
|
|
|
|
|
int val = 1;
|
1994-02-27 16:44:32 +01:00
|
|
|
|
int newval = 0;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (args1 == 0 && args2 == 0)
|
|
|
|
|
|
return val;
|
|
|
|
|
|
/* If one list is shorter than the other,
|
|
|
|
|
|
they fail to match. */
|
|
|
|
|
|
if (args1 == 0 || args2 == 0)
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
/* A null pointer instead of a type
|
|
|
|
|
|
means there is supposed to be an argument
|
|
|
|
|
|
but nothing is specified about what type it has.
|
|
|
|
|
|
So match anything that self-promotes. */
|
|
|
|
|
|
if (TREE_VALUE (args1) == 0)
|
|
|
|
|
|
{
|
2002-04-19 08:22:18 +02:00
|
|
|
|
if (c_type_promotes_to (TREE_VALUE (args2)) != TREE_VALUE (args2))
|
1992-02-28 19:53:39 +01:00
|
|
|
|
return 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (TREE_VALUE (args2) == 0)
|
|
|
|
|
|
{
|
2002-04-19 08:22:18 +02:00
|
|
|
|
if (c_type_promotes_to (TREE_VALUE (args1)) != TREE_VALUE (args1))
|
1992-02-28 19:53:39 +01:00
|
|
|
|
return 0;
|
|
|
|
|
|
}
|
2003-07-24 10:58:42 +02:00
|
|
|
|
/* If one of the lists has an error marker, ignore this arg. */
|
|
|
|
|
|
else if (TREE_CODE (TREE_VALUE (args1)) == ERROR_MARK
|
|
|
|
|
|
|| TREE_CODE (TREE_VALUE (args2)) == ERROR_MARK)
|
|
|
|
|
|
;
|
2003-06-22 15:41:26 +02:00
|
|
|
|
else if (! (newval = comptypes (TYPE_MAIN_VARIANT (TREE_VALUE (args1)),
|
2004-06-13 19:14:09 +02:00
|
|
|
|
TYPE_MAIN_VARIANT (TREE_VALUE (args2)))))
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
|
|
|
|
|
/* Allow wait (union {union wait *u; int *i} *)
|
|
|
|
|
|
and wait (union wait *) to be compatible. */
|
|
|
|
|
|
if (TREE_CODE (TREE_VALUE (args1)) == UNION_TYPE
|
1994-08-25 17:30:29 +02:00
|
|
|
|
&& (TYPE_NAME (TREE_VALUE (args1)) == 0
|
|
|
|
|
|
|| TYPE_TRANSPARENT_UNION (TREE_VALUE (args1)))
|
1992-02-28 19:53:39 +01:00
|
|
|
|
&& TREE_CODE (TYPE_SIZE (TREE_VALUE (args1))) == INTEGER_CST
|
|
|
|
|
|
&& tree_int_cst_equal (TYPE_SIZE (TREE_VALUE (args1)),
|
|
|
|
|
|
TYPE_SIZE (TREE_VALUE (args2))))
|
|
|
|
|
|
{
|
|
|
|
|
|
tree memb;
|
|
|
|
|
|
for (memb = TYPE_FIELDS (TREE_VALUE (args1));
|
|
|
|
|
|
memb; memb = TREE_CHAIN (memb))
|
2004-06-13 19:14:09 +02:00
|
|
|
|
if (comptypes (TREE_TYPE (memb), TREE_VALUE (args2)))
|
1992-02-28 19:53:39 +01:00
|
|
|
|
break;
|
|
|
|
|
|
if (memb == 0)
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (TREE_CODE (TREE_VALUE (args2)) == UNION_TYPE
|
1994-08-25 17:30:29 +02:00
|
|
|
|
&& (TYPE_NAME (TREE_VALUE (args2)) == 0
|
|
|
|
|
|
|| TYPE_TRANSPARENT_UNION (TREE_VALUE (args2)))
|
1992-02-28 19:53:39 +01:00
|
|
|
|
&& TREE_CODE (TYPE_SIZE (TREE_VALUE (args2))) == INTEGER_CST
|
|
|
|
|
|
&& tree_int_cst_equal (TYPE_SIZE (TREE_VALUE (args2)),
|
|
|
|
|
|
TYPE_SIZE (TREE_VALUE (args1))))
|
|
|
|
|
|
{
|
|
|
|
|
|
tree memb;
|
|
|
|
|
|
for (memb = TYPE_FIELDS (TREE_VALUE (args2));
|
|
|
|
|
|
memb; memb = TREE_CHAIN (memb))
|
2004-06-13 19:14:09 +02:00
|
|
|
|
if (comptypes (TREE_TYPE (memb), TREE_VALUE (args1)))
|
1992-02-28 19:53:39 +01:00
|
|
|
|
break;
|
|
|
|
|
|
if (memb == 0)
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* comptypes said ok, but record if it said to warn. */
|
|
|
|
|
|
if (newval > val)
|
|
|
|
|
|
val = newval;
|
|
|
|
|
|
|
|
|
|
|
|
args1 = TREE_CHAIN (args1);
|
|
|
|
|
|
args2 = TREE_CHAIN (args2);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Compute the size to increment a pointer by. */
|
|
|
|
|
|
|
|
|
|
|
|
tree
|
2003-06-22 15:41:26 +02:00
|
|
|
|
c_size_in_bytes (tree type)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
|
|
|
|
|
enum tree_code code = TREE_CODE (type);
|
|
|
|
|
|
|
builtins.c (c_strlen): Use size_diffop and return ssizetype value.
* builtins.c (c_strlen): Use size_diffop and return ssizetype value.
(expand_builtin_strcpy): Pass correct type to size_binop.
(expand_builtin_strcmp): Likewise.
Clean up conditional structure.
* c-decl.c (init_decl_processing): Don't call set_sizetype twice.
(complete_array_type): Don't use size_binop for MAXINDEX.
* c-typeck.c (c_sizeof): Use size_one_node and TYPE_SIZE_UNIT.
(c_sizeof_nowarn, c_size_in_bytes): Likewise.
(c_alignof): Use size_one_node.
(build_unary_op): Pass arg of proper type to size_binop.
(really_start_incremental_init, push_init_level): Use sizetype for
constructor{,_bit,_unfilled}_index.
(pop_init_label, output_init_element): Likewise.
(output_pending_init_elements, process_init_element): Likewise.
* calls.c (compute_argument_block_size): Field VAR is ssizetype.
* expr.c (store_expr): Use size_int.
(store_constructor): Use proper types for size_binop args.
(get_inner_reference, expand_expr, case ARRAY_REF): Likewise.
(expand_expr_unaligned): Likewise.
(string_contant): Return object of sizetype.
* expr.h (SUB_PARM_SIZE): Call size_diffop and pass proper types.
(ARGS_SIZE_RTX): Call ARGS_SIZE_TREE.
(ARGS_SIZE_TREE): Pass proper types to size_binop.
* fold-const.c (int_const_binop): Refine when size_int is called.
(fold_convert): Likewise.
(size_int_wide): Rework to take KIND as arg, only take low order
bits, handle new sizetype_tab datatype, and chain entries in
size_table.
(size_int_type_wide): New function.
(size_binop): Validate types of arguments.
(ssize_binop): Deleted.
(size_diffop): New function.
(extract_muldiv): Only fold division into multiplication for sizetypes.
* function.c (assign_parms): Use size_diffop and make sure
VAR field is of ssizetype; also pass proper type to size_binop.
(locate_and_pad_parm, pad_to_arg_alignment): Likewise.
(round_down): Deleted from here.
* store-layout.c (sizetype_tab): Now an array.
(sizetype_set, early_root_list): New variables.
(variable_size): Use size_one_node.
(round_up): Pass proper type to size_binop.
(round_down): Moved to here and corrected as above.
(layout_record): Pass proper arg types to size_binop.
(layout_type): Likewise.
If sizetype_set is zero, record the type just laid out.
(make_unsigned_type): Don't call set_sizetype;
(make_signed_type): Likewise; also, call fixup_signed_type.
(initialize_sizetypes): New function.
(set_sizetype): Make copy of types, set TYPE_IS_SIZETYPE, and
set name of bitsizetype to "bit_size_type".
Fix up type of sizes of all types made before call.
* tm.texi (ROUND_TYPE_SIZE_UNIT): New macro.
* tree.c (fix_sizetype): Deleted.
(build_common_tree_nodes): Call initialize_sizetypes.
(build_common_tree_nodes_2): Don't call fix_sizetype.
* tree.h (TYPE_IS_SIZETYPE): New macro.
(initialize_sizetype): New declaration.
(enum size_type_kind): New type.
(struct sizetype_tab): Deleted.
(sizetype_tab): Now array; adjust sizetype macros.
(size_diffop, size_int_type_wide): New functions.
(size_int_wide): Change number of args and type; access macros changed.
(ssize_int, sbitsize_int): New macros.
* config/i960/i960.h (ROUND_TYPE_SIZE): Use size_int.
(ROUND_TYPE_SIZE_UNIT): New macro.
* ch/actions.c (chill_convert_for_assignment): Don't use size_binop
for things that aren't sizes.
(expand_varying_length_assignment): Likewise.
* ch/convert.c (digest_array_tuple, convert): Likewise.
* ch/typeck.c (build_chill_slice, smash_dummy_type): Likewise.
(build_chill_slice_with_range): Likewise.
(build_chill_slice_with_length): Likewise.
(build_array_from_set): Adjust types for size_binop.
* ch/expr.c (build_concat_expr, build_chill_repetition_op): Likewise.
(build_chill_sizeof): Use TYPE_SIZE_UNIT.
* ch/tree.c (build_string_type): Pass proper type to size_binop.
* cp/class.c (dfs_build_vtable_offset_vtbl_entries): Don't use
size_binop on things that are not sizes; ssize_binop deleted.
Call size_diffop when appropriate.
(dfs_build_vcall_offset_vtbl_entries): Likewise.
(build_primary_vtable, build_secondary_vtable): Likewise.
(dfs_set_offset_for_unshared_vbases, dfs_modify_vtables): Likewise.
Variable I is HOST_WIDE_INT.
(get_vfield_offset): Pass proper types to size_binop.
(size_extra_vtbl_entries, layout_virtual_bases): Likewise.
(finish_struct_1): Likewise.
(skip_rtti_stuff): Arg N is now pointer to signed.
(layout_class_type): Use size_zero_node.
* cp/cp-tree.h (skip_rtti_stuff): Arg N is pointer to signed.
* cp/cvt.c (cp_convert_to_pointer): Pass proper types to size_binop.
* cp/decl.c (complete_arry_type): Pass proper types to size_binop.
(xref_basetypes): BINFO_OFFSET is sizetype.
* cp/error.c (dump_expr): Don't use size_binop non-sizes.
* cp/expr.c (cplus_expand_constant): Pass proper types to size_binop.
* cp/init.c (construct_virtual_bases): Fix type error.
(build_vec_delete_1): Pass proper type to size_binop and don't
fold result.
* cp/lex.c (cp_make_lang_type): BINFO_OFFSET is sizetype.
* cp/rtti.c (get_base_offset): Pass proper type to size_binop.
* cp/search.c (dfs_find_vbases): Fix type error.
(expand_upcast_fixups): Arg to skip_rtti_stuff is pointer to signed.
(dfs_get_vbase_types): BINFO_OFFSET is sizetype.
* cp/tree.c (debug_binfo): Variable N is signed.
Use HOST_WIDE_INT_PRINT_DEC.
* cp/typeck.c (comptypes): sizetype is same as equivalent integer type.
(c_sizeof, c_sizeof_nowarn, expr_sizeof): Use TYPE_SIZE_UNIT,
size_one_node and size_zero_node.
(c_alignof): Use size_one_node.
(build_component_addr): Pass proper types to size_binop.
(expand_ptrmemfunc_cst): Don't use size_binop on non-sizes.
* f/com.c (ffecom_arrayref_): Convert args to size_binop to proper
type.
(ffecom_tree_canonize_ptr_): Don't use size_binop for non-sizes.
(ffecom_tree_canonize_ref_): Likewise.
(type_for_mode): Handle TImode.
* f/ste.c (ffeste_io_dofio_, ffeste_io_douio_): Use TYPE_SIZE_UNIT.
(ffeste_io_ciclist_): Likewise.
* java/expr.c (build_java_ret): Pass proper type to size_binop.
From-SVN: r32225
2000-02-27 22:39:40 +01:00
|
|
|
|
if (code == FUNCTION_TYPE || code == VOID_TYPE || code == ERROR_MARK)
|
|
|
|
|
|
return size_one_node;
|
|
|
|
|
|
|
tree.h (COMPLETE_TYPE_P): New macro.
gcc
* tree.h (COMPLETE_TYPE_P): New macro.
(COMPLETE_OR_VOID_TYPE_P): New macro.
(COMPLETE_OR_UNBOUND_ARRAY_TYPE_P): New macro.
* stor-layout.c (layout_type, case VOID_TYPE): Don't set TYPE_SIZE.
* c-aux-info.c (gen_type): Use them.
* c-common.c (c_expand_expr_stmt): Likewise.
* c-decl.c (poplevel, pushdecl, start_decl, finish_decl,
grokdeclarator, grokparms, finish_struct, start_function,
store_parm_decls, combine_parm_decls): Likewise.
* c-parse.y (cast_expr): Likewise.
* c-typeck.c (require_complete_type, c_sizeof, c_sizeof_nowarn,
c_size_in_bytes, c_alignof, build_component_ref,
build_indirect_ref, build_array_ref, convert_arguments,
build_binary_op, pointer_diff, build_unary_op, digest_init: Likewise.
* calls.c (initialize_argument_information): Likewise.
* convert.c (convert_to_integer): Likewise.
* dbxout.c (dbxout_typedefs, dbxout_type, dbxout_symbol): Likewise.
* dwarfout.c (location_or_const_value_attribute,
output_enumeration_type_die, output_structure_type_die,
output_union_type_die, output_type): Likewise.
* expr.c (safe_from_p, expand_expr): Likewise.
* function.c (assign_parms): Likewise.
* sdbout.c (sdbout_symbol, sdbout_one_type): Likewise.
* tree.c (build_array_type, build_function_type,
build_method_type, build_offset_type, build_complex_type): Likewise.
* c-parse.c, c-parse.h: Regenerated.
gcc/cp
* typeck.c (require_complete_type, complete_type,
complete_type_or_else, c_sizeof, c_sizeof_nowarn,
build_array_ref, convert_arguments, pointer_diff,
build_x_unary_op, build_unary_op, build_c_cast,
build_modify_expr): Use COMPLETE_TYPE_P etc.
* call.c (is_complete, convert_like_real,
build_new_method_call): Likewise.
* class.c (build_vbase_pointer_fields, check_bases,
build_base_field, finish_struct_1, pushclass): Likewise.
* cvt.c (cp_convert_to_pointer, convert_to_void): Likewise.
* decl.c (maybe_process_template_type_declaration, pushtag,
pushdecl, redeclaration_error_message, start_decl, start_decl_1,
layout_var_decl, check_initializer, cp_finish_decl,
grokdeclarator, require_complete_types_for_parms,
grok_op_properties, xref_tag, xref_basetypes,
check_function_type): Likewise.
* decl2.c (check_classfn, reparse_absdcl_as_casts): Likewise.
* friend.c (do_friend): Likewise.
* init.c (build_offset_ref): Likewise.
* parse.y (structsp): Likewise.
* pt.c (maybe_process_partial_specialization,
tsubst_friend_function, instantiate_class_template, tsubst,
do_type_instantiation, instantiate_pending_templates): Likewise.
* repo.c (repo_get_id): Likewise.
* rtti.c (build_typeid, get_typeid, build_dynamic_cast_1,
synthesize_tinfo_var, emit_support_tinfos): Likewise.
* search.c (lookup_fnfields_1, lookup_conversions): Likewise.
* semantics.c (begin_class_definition): Likewise.
* tree.c (build_cplus_method_type): Likewise.
* typeck2.c (digest_init, build_functional_cast,
add_exception_specifier): Likewise.
* parse.h, parse.c: Regenerated.
From-SVN: r32671
2000-03-21 19:10:48 +01:00
|
|
|
|
if (!COMPLETE_OR_VOID_TYPE_P (type))
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
|
|
|
|
|
error ("arithmetic on pointer to an incomplete type");
|
builtins.c (c_strlen): Use size_diffop and return ssizetype value.
* builtins.c (c_strlen): Use size_diffop and return ssizetype value.
(expand_builtin_strcpy): Pass correct type to size_binop.
(expand_builtin_strcmp): Likewise.
Clean up conditional structure.
* c-decl.c (init_decl_processing): Don't call set_sizetype twice.
(complete_array_type): Don't use size_binop for MAXINDEX.
* c-typeck.c (c_sizeof): Use size_one_node and TYPE_SIZE_UNIT.
(c_sizeof_nowarn, c_size_in_bytes): Likewise.
(c_alignof): Use size_one_node.
(build_unary_op): Pass arg of proper type to size_binop.
(really_start_incremental_init, push_init_level): Use sizetype for
constructor{,_bit,_unfilled}_index.
(pop_init_label, output_init_element): Likewise.
(output_pending_init_elements, process_init_element): Likewise.
* calls.c (compute_argument_block_size): Field VAR is ssizetype.
* expr.c (store_expr): Use size_int.
(store_constructor): Use proper types for size_binop args.
(get_inner_reference, expand_expr, case ARRAY_REF): Likewise.
(expand_expr_unaligned): Likewise.
(string_contant): Return object of sizetype.
* expr.h (SUB_PARM_SIZE): Call size_diffop and pass proper types.
(ARGS_SIZE_RTX): Call ARGS_SIZE_TREE.
(ARGS_SIZE_TREE): Pass proper types to size_binop.
* fold-const.c (int_const_binop): Refine when size_int is called.
(fold_convert): Likewise.
(size_int_wide): Rework to take KIND as arg, only take low order
bits, handle new sizetype_tab datatype, and chain entries in
size_table.
(size_int_type_wide): New function.
(size_binop): Validate types of arguments.
(ssize_binop): Deleted.
(size_diffop): New function.
(extract_muldiv): Only fold division into multiplication for sizetypes.
* function.c (assign_parms): Use size_diffop and make sure
VAR field is of ssizetype; also pass proper type to size_binop.
(locate_and_pad_parm, pad_to_arg_alignment): Likewise.
(round_down): Deleted from here.
* store-layout.c (sizetype_tab): Now an array.
(sizetype_set, early_root_list): New variables.
(variable_size): Use size_one_node.
(round_up): Pass proper type to size_binop.
(round_down): Moved to here and corrected as above.
(layout_record): Pass proper arg types to size_binop.
(layout_type): Likewise.
If sizetype_set is zero, record the type just laid out.
(make_unsigned_type): Don't call set_sizetype;
(make_signed_type): Likewise; also, call fixup_signed_type.
(initialize_sizetypes): New function.
(set_sizetype): Make copy of types, set TYPE_IS_SIZETYPE, and
set name of bitsizetype to "bit_size_type".
Fix up type of sizes of all types made before call.
* tm.texi (ROUND_TYPE_SIZE_UNIT): New macro.
* tree.c (fix_sizetype): Deleted.
(build_common_tree_nodes): Call initialize_sizetypes.
(build_common_tree_nodes_2): Don't call fix_sizetype.
* tree.h (TYPE_IS_SIZETYPE): New macro.
(initialize_sizetype): New declaration.
(enum size_type_kind): New type.
(struct sizetype_tab): Deleted.
(sizetype_tab): Now array; adjust sizetype macros.
(size_diffop, size_int_type_wide): New functions.
(size_int_wide): Change number of args and type; access macros changed.
(ssize_int, sbitsize_int): New macros.
* config/i960/i960.h (ROUND_TYPE_SIZE): Use size_int.
(ROUND_TYPE_SIZE_UNIT): New macro.
* ch/actions.c (chill_convert_for_assignment): Don't use size_binop
for things that aren't sizes.
(expand_varying_length_assignment): Likewise.
* ch/convert.c (digest_array_tuple, convert): Likewise.
* ch/typeck.c (build_chill_slice, smash_dummy_type): Likewise.
(build_chill_slice_with_range): Likewise.
(build_chill_slice_with_length): Likewise.
(build_array_from_set): Adjust types for size_binop.
* ch/expr.c (build_concat_expr, build_chill_repetition_op): Likewise.
(build_chill_sizeof): Use TYPE_SIZE_UNIT.
* ch/tree.c (build_string_type): Pass proper type to size_binop.
* cp/class.c (dfs_build_vtable_offset_vtbl_entries): Don't use
size_binop on things that are not sizes; ssize_binop deleted.
Call size_diffop when appropriate.
(dfs_build_vcall_offset_vtbl_entries): Likewise.
(build_primary_vtable, build_secondary_vtable): Likewise.
(dfs_set_offset_for_unshared_vbases, dfs_modify_vtables): Likewise.
Variable I is HOST_WIDE_INT.
(get_vfield_offset): Pass proper types to size_binop.
(size_extra_vtbl_entries, layout_virtual_bases): Likewise.
(finish_struct_1): Likewise.
(skip_rtti_stuff): Arg N is now pointer to signed.
(layout_class_type): Use size_zero_node.
* cp/cp-tree.h (skip_rtti_stuff): Arg N is pointer to signed.
* cp/cvt.c (cp_convert_to_pointer): Pass proper types to size_binop.
* cp/decl.c (complete_arry_type): Pass proper types to size_binop.
(xref_basetypes): BINFO_OFFSET is sizetype.
* cp/error.c (dump_expr): Don't use size_binop non-sizes.
* cp/expr.c (cplus_expand_constant): Pass proper types to size_binop.
* cp/init.c (construct_virtual_bases): Fix type error.
(build_vec_delete_1): Pass proper type to size_binop and don't
fold result.
* cp/lex.c (cp_make_lang_type): BINFO_OFFSET is sizetype.
* cp/rtti.c (get_base_offset): Pass proper type to size_binop.
* cp/search.c (dfs_find_vbases): Fix type error.
(expand_upcast_fixups): Arg to skip_rtti_stuff is pointer to signed.
(dfs_get_vbase_types): BINFO_OFFSET is sizetype.
* cp/tree.c (debug_binfo): Variable N is signed.
Use HOST_WIDE_INT_PRINT_DEC.
* cp/typeck.c (comptypes): sizetype is same as equivalent integer type.
(c_sizeof, c_sizeof_nowarn, expr_sizeof): Use TYPE_SIZE_UNIT,
size_one_node and size_zero_node.
(c_alignof): Use size_one_node.
(build_component_addr): Pass proper types to size_binop.
(expand_ptrmemfunc_cst): Don't use size_binop on non-sizes.
* f/com.c (ffecom_arrayref_): Convert args to size_binop to proper
type.
(ffecom_tree_canonize_ptr_): Don't use size_binop for non-sizes.
(ffecom_tree_canonize_ref_): Likewise.
(type_for_mode): Handle TImode.
* f/ste.c (ffeste_io_dofio_, ffeste_io_douio_): Use TYPE_SIZE_UNIT.
(ffeste_io_ciclist_): Likewise.
* java/expr.c (build_java_ret): Pass proper type to size_binop.
From-SVN: r32225
2000-02-27 22:39:40 +01:00
|
|
|
|
return size_one_node;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Convert in case a char is more than one unit. */
|
builtins.c (c_strlen): Use size_diffop and return ssizetype value.
* builtins.c (c_strlen): Use size_diffop and return ssizetype value.
(expand_builtin_strcpy): Pass correct type to size_binop.
(expand_builtin_strcmp): Likewise.
Clean up conditional structure.
* c-decl.c (init_decl_processing): Don't call set_sizetype twice.
(complete_array_type): Don't use size_binop for MAXINDEX.
* c-typeck.c (c_sizeof): Use size_one_node and TYPE_SIZE_UNIT.
(c_sizeof_nowarn, c_size_in_bytes): Likewise.
(c_alignof): Use size_one_node.
(build_unary_op): Pass arg of proper type to size_binop.
(really_start_incremental_init, push_init_level): Use sizetype for
constructor{,_bit,_unfilled}_index.
(pop_init_label, output_init_element): Likewise.
(output_pending_init_elements, process_init_element): Likewise.
* calls.c (compute_argument_block_size): Field VAR is ssizetype.
* expr.c (store_expr): Use size_int.
(store_constructor): Use proper types for size_binop args.
(get_inner_reference, expand_expr, case ARRAY_REF): Likewise.
(expand_expr_unaligned): Likewise.
(string_contant): Return object of sizetype.
* expr.h (SUB_PARM_SIZE): Call size_diffop and pass proper types.
(ARGS_SIZE_RTX): Call ARGS_SIZE_TREE.
(ARGS_SIZE_TREE): Pass proper types to size_binop.
* fold-const.c (int_const_binop): Refine when size_int is called.
(fold_convert): Likewise.
(size_int_wide): Rework to take KIND as arg, only take low order
bits, handle new sizetype_tab datatype, and chain entries in
size_table.
(size_int_type_wide): New function.
(size_binop): Validate types of arguments.
(ssize_binop): Deleted.
(size_diffop): New function.
(extract_muldiv): Only fold division into multiplication for sizetypes.
* function.c (assign_parms): Use size_diffop and make sure
VAR field is of ssizetype; also pass proper type to size_binop.
(locate_and_pad_parm, pad_to_arg_alignment): Likewise.
(round_down): Deleted from here.
* store-layout.c (sizetype_tab): Now an array.
(sizetype_set, early_root_list): New variables.
(variable_size): Use size_one_node.
(round_up): Pass proper type to size_binop.
(round_down): Moved to here and corrected as above.
(layout_record): Pass proper arg types to size_binop.
(layout_type): Likewise.
If sizetype_set is zero, record the type just laid out.
(make_unsigned_type): Don't call set_sizetype;
(make_signed_type): Likewise; also, call fixup_signed_type.
(initialize_sizetypes): New function.
(set_sizetype): Make copy of types, set TYPE_IS_SIZETYPE, and
set name of bitsizetype to "bit_size_type".
Fix up type of sizes of all types made before call.
* tm.texi (ROUND_TYPE_SIZE_UNIT): New macro.
* tree.c (fix_sizetype): Deleted.
(build_common_tree_nodes): Call initialize_sizetypes.
(build_common_tree_nodes_2): Don't call fix_sizetype.
* tree.h (TYPE_IS_SIZETYPE): New macro.
(initialize_sizetype): New declaration.
(enum size_type_kind): New type.
(struct sizetype_tab): Deleted.
(sizetype_tab): Now array; adjust sizetype macros.
(size_diffop, size_int_type_wide): New functions.
(size_int_wide): Change number of args and type; access macros changed.
(ssize_int, sbitsize_int): New macros.
* config/i960/i960.h (ROUND_TYPE_SIZE): Use size_int.
(ROUND_TYPE_SIZE_UNIT): New macro.
* ch/actions.c (chill_convert_for_assignment): Don't use size_binop
for things that aren't sizes.
(expand_varying_length_assignment): Likewise.
* ch/convert.c (digest_array_tuple, convert): Likewise.
* ch/typeck.c (build_chill_slice, smash_dummy_type): Likewise.
(build_chill_slice_with_range): Likewise.
(build_chill_slice_with_length): Likewise.
(build_array_from_set): Adjust types for size_binop.
* ch/expr.c (build_concat_expr, build_chill_repetition_op): Likewise.
(build_chill_sizeof): Use TYPE_SIZE_UNIT.
* ch/tree.c (build_string_type): Pass proper type to size_binop.
* cp/class.c (dfs_build_vtable_offset_vtbl_entries): Don't use
size_binop on things that are not sizes; ssize_binop deleted.
Call size_diffop when appropriate.
(dfs_build_vcall_offset_vtbl_entries): Likewise.
(build_primary_vtable, build_secondary_vtable): Likewise.
(dfs_set_offset_for_unshared_vbases, dfs_modify_vtables): Likewise.
Variable I is HOST_WIDE_INT.
(get_vfield_offset): Pass proper types to size_binop.
(size_extra_vtbl_entries, layout_virtual_bases): Likewise.
(finish_struct_1): Likewise.
(skip_rtti_stuff): Arg N is now pointer to signed.
(layout_class_type): Use size_zero_node.
* cp/cp-tree.h (skip_rtti_stuff): Arg N is pointer to signed.
* cp/cvt.c (cp_convert_to_pointer): Pass proper types to size_binop.
* cp/decl.c (complete_arry_type): Pass proper types to size_binop.
(xref_basetypes): BINFO_OFFSET is sizetype.
* cp/error.c (dump_expr): Don't use size_binop non-sizes.
* cp/expr.c (cplus_expand_constant): Pass proper types to size_binop.
* cp/init.c (construct_virtual_bases): Fix type error.
(build_vec_delete_1): Pass proper type to size_binop and don't
fold result.
* cp/lex.c (cp_make_lang_type): BINFO_OFFSET is sizetype.
* cp/rtti.c (get_base_offset): Pass proper type to size_binop.
* cp/search.c (dfs_find_vbases): Fix type error.
(expand_upcast_fixups): Arg to skip_rtti_stuff is pointer to signed.
(dfs_get_vbase_types): BINFO_OFFSET is sizetype.
* cp/tree.c (debug_binfo): Variable N is signed.
Use HOST_WIDE_INT_PRINT_DEC.
* cp/typeck.c (comptypes): sizetype is same as equivalent integer type.
(c_sizeof, c_sizeof_nowarn, expr_sizeof): Use TYPE_SIZE_UNIT,
size_one_node and size_zero_node.
(c_alignof): Use size_one_node.
(build_component_addr): Pass proper types to size_binop.
(expand_ptrmemfunc_cst): Don't use size_binop on non-sizes.
* f/com.c (ffecom_arrayref_): Convert args to size_binop to proper
type.
(ffecom_tree_canonize_ptr_): Don't use size_binop for non-sizes.
(ffecom_tree_canonize_ref_): Likewise.
(type_for_mode): Handle TImode.
* f/ste.c (ffeste_io_dofio_, ffeste_io_douio_): Use TYPE_SIZE_UNIT.
(ffeste_io_ciclist_): Likewise.
* java/expr.c (build_java_ret): Pass proper type to size_binop.
From-SVN: r32225
2000-02-27 22:39:40 +01:00
|
|
|
|
return size_binop (CEIL_DIV_EXPR, TYPE_SIZE_UNIT (type),
|
|
|
|
|
|
size_int (TYPE_PRECISION (char_type_node)
|
|
|
|
|
|
/ BITS_PER_UNIT));
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Return either DECL or its known constant value (if it has one). */
|
|
|
|
|
|
|
2000-09-10 23:34:41 +02:00
|
|
|
|
tree
|
2003-06-22 15:41:26 +02:00
|
|
|
|
decl_constant_value (tree decl)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
1996-10-08 22:01:15 +02:00
|
|
|
|
if (/* Don't change a variable array bound or initial value to a constant
|
2004-04-05 14:25:26 +02:00
|
|
|
|
in a place where a variable is invalid. Note that DECL_INITIAL
|
|
|
|
|
|
isn't valid for a PARM_DECL. */
|
1996-10-08 22:01:15 +02:00
|
|
|
|
current_function_decl != 0
|
2004-04-05 14:25:26 +02:00
|
|
|
|
&& TREE_CODE (decl) != PARM_DECL
|
1992-02-28 19:53:39 +01:00
|
|
|
|
&& ! TREE_THIS_VOLATILE (decl)
|
2000-08-25 02:58:27 +02:00
|
|
|
|
&& TREE_READONLY (decl)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
&& DECL_INITIAL (decl) != 0
|
|
|
|
|
|
&& TREE_CODE (DECL_INITIAL (decl)) != ERROR_MARK
|
|
|
|
|
|
/* This is invalid if initial value is not constant.
|
|
|
|
|
|
If it has either a function call, a memory reference,
|
|
|
|
|
|
or a variable, then re-evaluating it could give different results. */
|
|
|
|
|
|
&& TREE_CONSTANT (DECL_INITIAL (decl))
|
|
|
|
|
|
/* Check for cases where this is sub-optimal, even though valid. */
|
2000-10-20 17:59:07 +02:00
|
|
|
|
&& TREE_CODE (DECL_INITIAL (decl)) != CONSTRUCTOR)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
return DECL_INITIAL (decl);
|
|
|
|
|
|
return decl;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2000-10-20 17:59:07 +02:00
|
|
|
|
/* Return either DECL or its known constant value (if it has one), but
|
|
|
|
|
|
return DECL if pedantic or DECL has mode BLKmode. This is for
|
|
|
|
|
|
bug-compatibility with the old behavior of decl_constant_value
|
|
|
|
|
|
(before GCC 3.0); every use of this function is a bug and it should
|
|
|
|
|
|
be removed before GCC 3.1. It is not appropriate to use pedantic
|
|
|
|
|
|
in a way that affects optimization, and BLKmode is probably not the
|
|
|
|
|
|
right test for avoiding misoptimizations either. */
|
|
|
|
|
|
|
|
|
|
|
|
static tree
|
2003-06-22 15:41:26 +02:00
|
|
|
|
decl_constant_value_for_broken_optimization (tree decl)
|
2000-10-20 17:59:07 +02:00
|
|
|
|
{
|
|
|
|
|
|
if (pedantic || DECL_MODE (decl) == BLKmode)
|
|
|
|
|
|
return decl;
|
|
|
|
|
|
else
|
|
|
|
|
|
return decl_constant_value (decl);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
re PR c/461 (non-lvalue arrays)
* c-common.c (c_expand_expr_stmt): Apply default conversions to
non-lvalue arrays if C99.
* c-typeck.c (default_conversion): Split out code handling
array-to-pointer and function-to-pointer conversions into a
separate default_function_array_conversion function.
(default_function_array_conversion): New function. Keep track of
whether any NON_LVALUE_EXPRs were stripped. Return non-lvalue
arrays unchanged outside C99 mode instead of giving an error for
them.
(build_component_ref): Use pedantic_non_lvalue when handling
COMPOUND_EXPR. Don't handle COND_EXPR specially.
(convert_arguments): Use default_function_array_conversion.
(build_unary_op): For ADDR_EXPR, take a flag indicating whether
non-lvalues are OK.
(unary_complex_lvalue): Likewise.
(internal_build_compound_expr): Use
default_function_array_conversion. Apply default conversions to
function in compound expression.
(build_c_cast, build_modify_expr, digest_init, build_asm_stmt):
Use default_function_array_conversion.
* doc/extend.texi: Update documentation of subscripting non-lvalue
arrays.
Fixes PR c/461.
testsuite:
* gcc.dg/c90-array-lval-1.c, gcc.dg/c90-array-lval-2.c,
gcc.dg/c99-array-lval-1.c, gcc.dg/c99-array-lval-2.c: Remove
XFAILs. Adjust expected error texts.
* gcc.c-torture/compile/20011106-1.c,
gcc.c-torture/compile/20011106-2.c, gcc.dg/c90-array-lval-3.c,
gcc.dg/c90-array-lval-4.c, gcc.dg/c90-array-lval-5.c,
gcc.dg/c99-array-lval-3.c, gcc.dg/c99-array-lval-4.c,
gcc.dg/c99-array-lval-5.c: New tests.
From-SVN: r46805
2001-11-06 13:39:36 +01:00
|
|
|
|
|
|
|
|
|
|
/* Perform the default conversion of arrays and functions to pointers.
|
|
|
|
|
|
Return the result of converting EXP. For any other expression, just
|
|
|
|
|
|
return EXP. */
|
|
|
|
|
|
|
|
|
|
|
|
static tree
|
2003-06-22 15:41:26 +02:00
|
|
|
|
default_function_array_conversion (tree exp)
|
re PR c/461 (non-lvalue arrays)
* c-common.c (c_expand_expr_stmt): Apply default conversions to
non-lvalue arrays if C99.
* c-typeck.c (default_conversion): Split out code handling
array-to-pointer and function-to-pointer conversions into a
separate default_function_array_conversion function.
(default_function_array_conversion): New function. Keep track of
whether any NON_LVALUE_EXPRs were stripped. Return non-lvalue
arrays unchanged outside C99 mode instead of giving an error for
them.
(build_component_ref): Use pedantic_non_lvalue when handling
COMPOUND_EXPR. Don't handle COND_EXPR specially.
(convert_arguments): Use default_function_array_conversion.
(build_unary_op): For ADDR_EXPR, take a flag indicating whether
non-lvalues are OK.
(unary_complex_lvalue): Likewise.
(internal_build_compound_expr): Use
default_function_array_conversion. Apply default conversions to
function in compound expression.
(build_c_cast, build_modify_expr, digest_init, build_asm_stmt):
Use default_function_array_conversion.
* doc/extend.texi: Update documentation of subscripting non-lvalue
arrays.
Fixes PR c/461.
testsuite:
* gcc.dg/c90-array-lval-1.c, gcc.dg/c90-array-lval-2.c,
gcc.dg/c99-array-lval-1.c, gcc.dg/c99-array-lval-2.c: Remove
XFAILs. Adjust expected error texts.
* gcc.c-torture/compile/20011106-1.c,
gcc.c-torture/compile/20011106-2.c, gcc.dg/c90-array-lval-3.c,
gcc.dg/c90-array-lval-4.c, gcc.dg/c90-array-lval-5.c,
gcc.dg/c99-array-lval-3.c, gcc.dg/c99-array-lval-4.c,
gcc.dg/c99-array-lval-5.c: New tests.
From-SVN: r46805
2001-11-06 13:39:36 +01:00
|
|
|
|
{
|
|
|
|
|
|
tree orig_exp;
|
|
|
|
|
|
tree type = TREE_TYPE (exp);
|
|
|
|
|
|
enum tree_code code = TREE_CODE (type);
|
|
|
|
|
|
int not_lvalue = 0;
|
|
|
|
|
|
|
|
|
|
|
|
/* Strip NON_LVALUE_EXPRs and no-op conversions, since we aren't using as
|
2003-06-22 15:41:26 +02:00
|
|
|
|
an lvalue.
|
re PR c/461 (non-lvalue arrays)
* c-common.c (c_expand_expr_stmt): Apply default conversions to
non-lvalue arrays if C99.
* c-typeck.c (default_conversion): Split out code handling
array-to-pointer and function-to-pointer conversions into a
separate default_function_array_conversion function.
(default_function_array_conversion): New function. Keep track of
whether any NON_LVALUE_EXPRs were stripped. Return non-lvalue
arrays unchanged outside C99 mode instead of giving an error for
them.
(build_component_ref): Use pedantic_non_lvalue when handling
COMPOUND_EXPR. Don't handle COND_EXPR specially.
(convert_arguments): Use default_function_array_conversion.
(build_unary_op): For ADDR_EXPR, take a flag indicating whether
non-lvalues are OK.
(unary_complex_lvalue): Likewise.
(internal_build_compound_expr): Use
default_function_array_conversion. Apply default conversions to
function in compound expression.
(build_c_cast, build_modify_expr, digest_init, build_asm_stmt):
Use default_function_array_conversion.
* doc/extend.texi: Update documentation of subscripting non-lvalue
arrays.
Fixes PR c/461.
testsuite:
* gcc.dg/c90-array-lval-1.c, gcc.dg/c90-array-lval-2.c,
gcc.dg/c99-array-lval-1.c, gcc.dg/c99-array-lval-2.c: Remove
XFAILs. Adjust expected error texts.
* gcc.c-torture/compile/20011106-1.c,
gcc.c-torture/compile/20011106-2.c, gcc.dg/c90-array-lval-3.c,
gcc.dg/c90-array-lval-4.c, gcc.dg/c90-array-lval-5.c,
gcc.dg/c99-array-lval-3.c, gcc.dg/c99-array-lval-4.c,
gcc.dg/c99-array-lval-5.c: New tests.
From-SVN: r46805
2001-11-06 13:39:36 +01:00
|
|
|
|
|
|
|
|
|
|
Do not use STRIP_NOPS here! It will remove conversions from pointer
|
|
|
|
|
|
to integer and cause infinite recursion. */
|
|
|
|
|
|
orig_exp = exp;
|
|
|
|
|
|
while (TREE_CODE (exp) == NON_LVALUE_EXPR
|
|
|
|
|
|
|| (TREE_CODE (exp) == NOP_EXPR
|
|
|
|
|
|
&& TREE_TYPE (TREE_OPERAND (exp, 0)) == TREE_TYPE (exp)))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (TREE_CODE (exp) == NON_LVALUE_EXPR)
|
|
|
|
|
|
not_lvalue = 1;
|
|
|
|
|
|
exp = TREE_OPERAND (exp, 0);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
c-tree.h (struct c_expr): Define.
* c-tree.h (struct c_expr): Define.
(C_SET_EXP_ORIGINAL_CODE): Remove.
(parser_build_binary_op, build_compound_expr): Update prototypes.
* c-parse.in (%union): Add exprtype.
(FUNC_NAME): Mark as ttype.
(expr, expr_no_commas, cast_expr, unary_expr, primary): Change to
exprtype.
(expr): Update. Define directly in terms of expr_no_commas
instead of using nonnull_exprlist.
(nonnull_exprlist, unary_expr, cast_expr, expr_no_commas, primary,
offsetof_member_designator, typespec_nonreserved_nonattr, init,
initval, designator, component_declarator,
component_notype_declarator, enumerator, array_declarator,
condition, exexpr, switch_statement, stmt_nocomp, stmt,
nonnull_asm_operands, ivar_declarator, receiver): Update. Don't
set C_EXP_ORIGINAL_CODE. Use TREE_NO_WARNING for assignments
where appropriate.
* c-common.h (C_EXP_ORIGINAL_CODE): Remove.
* c-common.c (c_common_truthvalue_conversion): Don't check
C_EXP_ORIGINAL_CODE.
* c-typeck.c (parser_build_binary_op): Use c_expr structures.
Don't use C_EXP_ORIGINAL_CODE.
(default_conversion, default_function_array_conversion): Don't use
C_EXP_ORIGINAL_CODE. Preserve TREE_NO_WARNING.
(internal_build_compound_expr): Merge into build_compound_expr.
(build_compound_expr): Take two operands instead of a TREE_LIST.
* objc/objc-act.c (get_super_receiver): Update calls to
build_compound_expr.
cp:
* typeck.c (build_modify_expr, build_x_modify_expr): Set
TREE_NO_WARNING on assignments with an operator other than '='.
testsuite:
* g++.dg/warn/Wparentheses-1.C, g++.dg/warn/Wparentheses-2.C,
gcc.dg/Wparentheses-10.c: New tests.
* gcc.dg/Wparentheses-5.c: Remove XFAILs.
From-SVN: r84911
2004-07-19 10:38:52 +02:00
|
|
|
|
if (TREE_NO_WARNING (orig_exp))
|
|
|
|
|
|
TREE_NO_WARNING (exp) = 1;
|
re PR c/461 (non-lvalue arrays)
* c-common.c (c_expand_expr_stmt): Apply default conversions to
non-lvalue arrays if C99.
* c-typeck.c (default_conversion): Split out code handling
array-to-pointer and function-to-pointer conversions into a
separate default_function_array_conversion function.
(default_function_array_conversion): New function. Keep track of
whether any NON_LVALUE_EXPRs were stripped. Return non-lvalue
arrays unchanged outside C99 mode instead of giving an error for
them.
(build_component_ref): Use pedantic_non_lvalue when handling
COMPOUND_EXPR. Don't handle COND_EXPR specially.
(convert_arguments): Use default_function_array_conversion.
(build_unary_op): For ADDR_EXPR, take a flag indicating whether
non-lvalues are OK.
(unary_complex_lvalue): Likewise.
(internal_build_compound_expr): Use
default_function_array_conversion. Apply default conversions to
function in compound expression.
(build_c_cast, build_modify_expr, digest_init, build_asm_stmt):
Use default_function_array_conversion.
* doc/extend.texi: Update documentation of subscripting non-lvalue
arrays.
Fixes PR c/461.
testsuite:
* gcc.dg/c90-array-lval-1.c, gcc.dg/c90-array-lval-2.c,
gcc.dg/c99-array-lval-1.c, gcc.dg/c99-array-lval-2.c: Remove
XFAILs. Adjust expected error texts.
* gcc.c-torture/compile/20011106-1.c,
gcc.c-torture/compile/20011106-2.c, gcc.dg/c90-array-lval-3.c,
gcc.dg/c90-array-lval-4.c, gcc.dg/c90-array-lval-5.c,
gcc.dg/c99-array-lval-3.c, gcc.dg/c99-array-lval-4.c,
gcc.dg/c99-array-lval-5.c: New tests.
From-SVN: r46805
2001-11-06 13:39:36 +01:00
|
|
|
|
|
|
|
|
|
|
if (code == FUNCTION_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
return build_unary_op (ADDR_EXPR, exp, 0);
|
|
|
|
|
|
}
|
|
|
|
|
|
if (code == ARRAY_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
tree adr;
|
|
|
|
|
|
tree restype = TREE_TYPE (type);
|
|
|
|
|
|
tree ptrtype;
|
|
|
|
|
|
int constp = 0;
|
|
|
|
|
|
int volatilep = 0;
|
|
|
|
|
|
int lvalue_array_p;
|
|
|
|
|
|
|
|
|
|
|
|
if (TREE_CODE_CLASS (TREE_CODE (exp)) == 'r' || DECL_P (exp))
|
|
|
|
|
|
{
|
|
|
|
|
|
constp = TREE_READONLY (exp);
|
|
|
|
|
|
volatilep = TREE_THIS_VOLATILE (exp);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (TYPE_QUALS (type) || constp || volatilep)
|
2003-06-22 15:41:26 +02:00
|
|
|
|
restype
|
re PR c/461 (non-lvalue arrays)
* c-common.c (c_expand_expr_stmt): Apply default conversions to
non-lvalue arrays if C99.
* c-typeck.c (default_conversion): Split out code handling
array-to-pointer and function-to-pointer conversions into a
separate default_function_array_conversion function.
(default_function_array_conversion): New function. Keep track of
whether any NON_LVALUE_EXPRs were stripped. Return non-lvalue
arrays unchanged outside C99 mode instead of giving an error for
them.
(build_component_ref): Use pedantic_non_lvalue when handling
COMPOUND_EXPR. Don't handle COND_EXPR specially.
(convert_arguments): Use default_function_array_conversion.
(build_unary_op): For ADDR_EXPR, take a flag indicating whether
non-lvalues are OK.
(unary_complex_lvalue): Likewise.
(internal_build_compound_expr): Use
default_function_array_conversion. Apply default conversions to
function in compound expression.
(build_c_cast, build_modify_expr, digest_init, build_asm_stmt):
Use default_function_array_conversion.
* doc/extend.texi: Update documentation of subscripting non-lvalue
arrays.
Fixes PR c/461.
testsuite:
* gcc.dg/c90-array-lval-1.c, gcc.dg/c90-array-lval-2.c,
gcc.dg/c99-array-lval-1.c, gcc.dg/c99-array-lval-2.c: Remove
XFAILs. Adjust expected error texts.
* gcc.c-torture/compile/20011106-1.c,
gcc.c-torture/compile/20011106-2.c, gcc.dg/c90-array-lval-3.c,
gcc.dg/c90-array-lval-4.c, gcc.dg/c90-array-lval-5.c,
gcc.dg/c99-array-lval-3.c, gcc.dg/c99-array-lval-4.c,
gcc.dg/c99-array-lval-5.c: New tests.
From-SVN: r46805
2001-11-06 13:39:36 +01:00
|
|
|
|
= c_build_qualified_type (restype,
|
2003-06-22 15:41:26 +02:00
|
|
|
|
TYPE_QUALS (type)
|
re PR c/461 (non-lvalue arrays)
* c-common.c (c_expand_expr_stmt): Apply default conversions to
non-lvalue arrays if C99.
* c-typeck.c (default_conversion): Split out code handling
array-to-pointer and function-to-pointer conversions into a
separate default_function_array_conversion function.
(default_function_array_conversion): New function. Keep track of
whether any NON_LVALUE_EXPRs were stripped. Return non-lvalue
arrays unchanged outside C99 mode instead of giving an error for
them.
(build_component_ref): Use pedantic_non_lvalue when handling
COMPOUND_EXPR. Don't handle COND_EXPR specially.
(convert_arguments): Use default_function_array_conversion.
(build_unary_op): For ADDR_EXPR, take a flag indicating whether
non-lvalues are OK.
(unary_complex_lvalue): Likewise.
(internal_build_compound_expr): Use
default_function_array_conversion. Apply default conversions to
function in compound expression.
(build_c_cast, build_modify_expr, digest_init, build_asm_stmt):
Use default_function_array_conversion.
* doc/extend.texi: Update documentation of subscripting non-lvalue
arrays.
Fixes PR c/461.
testsuite:
* gcc.dg/c90-array-lval-1.c, gcc.dg/c90-array-lval-2.c,
gcc.dg/c99-array-lval-1.c, gcc.dg/c99-array-lval-2.c: Remove
XFAILs. Adjust expected error texts.
* gcc.c-torture/compile/20011106-1.c,
gcc.c-torture/compile/20011106-2.c, gcc.dg/c90-array-lval-3.c,
gcc.dg/c90-array-lval-4.c, gcc.dg/c90-array-lval-5.c,
gcc.dg/c99-array-lval-3.c, gcc.dg/c99-array-lval-4.c,
gcc.dg/c99-array-lval-5.c: New tests.
From-SVN: r46805
2001-11-06 13:39:36 +01:00
|
|
|
|
| (constp * TYPE_QUAL_CONST)
|
|
|
|
|
|
| (volatilep * TYPE_QUAL_VOLATILE));
|
|
|
|
|
|
|
|
|
|
|
|
if (TREE_CODE (exp) == INDIRECT_REF)
|
2004-06-12 08:02:51 +02:00
|
|
|
|
return convert (build_pointer_type (restype),
|
re PR c/461 (non-lvalue arrays)
* c-common.c (c_expand_expr_stmt): Apply default conversions to
non-lvalue arrays if C99.
* c-typeck.c (default_conversion): Split out code handling
array-to-pointer and function-to-pointer conversions into a
separate default_function_array_conversion function.
(default_function_array_conversion): New function. Keep track of
whether any NON_LVALUE_EXPRs were stripped. Return non-lvalue
arrays unchanged outside C99 mode instead of giving an error for
them.
(build_component_ref): Use pedantic_non_lvalue when handling
COMPOUND_EXPR. Don't handle COND_EXPR specially.
(convert_arguments): Use default_function_array_conversion.
(build_unary_op): For ADDR_EXPR, take a flag indicating whether
non-lvalues are OK.
(unary_complex_lvalue): Likewise.
(internal_build_compound_expr): Use
default_function_array_conversion. Apply default conversions to
function in compound expression.
(build_c_cast, build_modify_expr, digest_init, build_asm_stmt):
Use default_function_array_conversion.
* doc/extend.texi: Update documentation of subscripting non-lvalue
arrays.
Fixes PR c/461.
testsuite:
* gcc.dg/c90-array-lval-1.c, gcc.dg/c90-array-lval-2.c,
gcc.dg/c99-array-lval-1.c, gcc.dg/c99-array-lval-2.c: Remove
XFAILs. Adjust expected error texts.
* gcc.c-torture/compile/20011106-1.c,
gcc.c-torture/compile/20011106-2.c, gcc.dg/c90-array-lval-3.c,
gcc.dg/c90-array-lval-4.c, gcc.dg/c90-array-lval-5.c,
gcc.dg/c99-array-lval-3.c, gcc.dg/c99-array-lval-4.c,
gcc.dg/c99-array-lval-5.c: New tests.
From-SVN: r46805
2001-11-06 13:39:36 +01:00
|
|
|
|
TREE_OPERAND (exp, 0));
|
|
|
|
|
|
|
|
|
|
|
|
if (TREE_CODE (exp) == COMPOUND_EXPR)
|
|
|
|
|
|
{
|
|
|
|
|
|
tree op1 = default_conversion (TREE_OPERAND (exp, 1));
|
|
|
|
|
|
return build (COMPOUND_EXPR, TREE_TYPE (op1),
|
|
|
|
|
|
TREE_OPERAND (exp, 0), op1);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
lvalue_array_p = !not_lvalue && lvalue_p (exp);
|
2001-12-04 23:55:40 +01:00
|
|
|
|
if (!flag_isoc99 && !lvalue_array_p)
|
re PR c/461 (non-lvalue arrays)
* c-common.c (c_expand_expr_stmt): Apply default conversions to
non-lvalue arrays if C99.
* c-typeck.c (default_conversion): Split out code handling
array-to-pointer and function-to-pointer conversions into a
separate default_function_array_conversion function.
(default_function_array_conversion): New function. Keep track of
whether any NON_LVALUE_EXPRs were stripped. Return non-lvalue
arrays unchanged outside C99 mode instead of giving an error for
them.
(build_component_ref): Use pedantic_non_lvalue when handling
COMPOUND_EXPR. Don't handle COND_EXPR specially.
(convert_arguments): Use default_function_array_conversion.
(build_unary_op): For ADDR_EXPR, take a flag indicating whether
non-lvalues are OK.
(unary_complex_lvalue): Likewise.
(internal_build_compound_expr): Use
default_function_array_conversion. Apply default conversions to
function in compound expression.
(build_c_cast, build_modify_expr, digest_init, build_asm_stmt):
Use default_function_array_conversion.
* doc/extend.texi: Update documentation of subscripting non-lvalue
arrays.
Fixes PR c/461.
testsuite:
* gcc.dg/c90-array-lval-1.c, gcc.dg/c90-array-lval-2.c,
gcc.dg/c99-array-lval-1.c, gcc.dg/c99-array-lval-2.c: Remove
XFAILs. Adjust expected error texts.
* gcc.c-torture/compile/20011106-1.c,
gcc.c-torture/compile/20011106-2.c, gcc.dg/c90-array-lval-3.c,
gcc.dg/c90-array-lval-4.c, gcc.dg/c90-array-lval-5.c,
gcc.dg/c99-array-lval-3.c, gcc.dg/c99-array-lval-4.c,
gcc.dg/c99-array-lval-5.c: New tests.
From-SVN: r46805
2001-11-06 13:39:36 +01:00
|
|
|
|
{
|
|
|
|
|
|
/* Before C99, non-lvalue arrays do not decay to pointers.
|
|
|
|
|
|
Normally, using such an array would be invalid; but it can
|
|
|
|
|
|
be used correctly inside sizeof or as a statement expression.
|
|
|
|
|
|
Thus, do not give an error here; an error will result later. */
|
|
|
|
|
|
return exp;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
ptrtype = build_pointer_type (restype);
|
|
|
|
|
|
|
|
|
|
|
|
if (TREE_CODE (exp) == VAR_DECL)
|
|
|
|
|
|
{
|
alias.c (adjust_offset_for_component_ref): Use component_ref_field_offset.
* alias.c (adjust_offset_for_component_ref): Use
component_ref_field_offset.
* c-decl.c (build_array_declarator): Add news args for ARRAY_REF.
* c-gimplify.c (gimplify_expr_stmt): Use alloc_stmt_list.
(gimplify_decl_stmt): Call gimplify_type_sizes for type.
For decl, call gimplify_one_sizepos and use statement list.
(gimplify_compound_literal_expr): New arg PRE_P.
Add statement to PRE_P list and return DECL.
(c_gimplify_expr, case COMPOUND_LITERAL_EXPR): Add arg to
gimplify_compound_literal_expr.
* c-tree.h (getdecls): Deleted.
* c-typeck.c (build_component_ref): Add operand for COMPONENT_REF.
(build_array_ref): Add two operands for ARRAY_REF.
(build_unary_op): Set TREE_INVARIANT and TREE_CONSTANT for
COMPOUND_LITERAL_EXPR.
* coverage.c (tree_coverage_counter_ref): Add new operands
for ARRAY_REF.
* emit-rtl.c (component_ref_for_mem_expr): Add new operand
for COMPONENT_REF.
(set_mem_attributes_minus_bitpos): Use array_ref_low_bound
and array_ref_element_size.
(widen_memory_access):Use component_ref_field_offset.
* explow.c (update_nonlocal_goto_save_area): Add two operands
for ARRAY_REF.
* expr.c (array_ref_element_size, array_ref_low_bound): New functions.
(component_ref_field_offset): Likewise.
(get_inner_reference): Use them.
(expand_expr_real_1, case ARRAY_REF): Use array_ref_low_bound.
* fold-const.c (fold, case EQ_EXPR): Properly handle DECL_SIZE.
(fold_read_from_constant_string): Use array_ref_low_bound.
Verify that result is a character type.
(build_fold_indirect_ref): Add two operands for ARRAY_REF.
* function.c (expand_function_start): Likewise.
* gimple-low.c (expand_var_p): Delete duplicated line.
* gimplify.c: Add static decls for local functions.
(cgraph.h): Now included.
(create_tmp_var): Remove check for ARRAY_TYPE.
(copy_if_shared_r): Look at bounds and sizes of types.
(build_and_jump): Return alloc_stmt_list instead of build_empty_stmt.
(gimplify_exit_expr, shortcut_cond_expr): Likewise.
(gimplify_save_expr, gimple_push_cleanup): Likewise.
(gimplify_init_constructor): Likewise.
WANT_VALUE now bool.
If empty list with no result wanted, return GS_UNHANDLED.
Add additional operands for ARRAY_REF and COMPONENT_REF.
(canonicalize_component_ref): Convert to &array[L].
(gimplify_array_ref_to_plus): Use array_ref_element_size and
array_ref_lower_bound.
(build_addr_expr_with_type, build_addr_expr): New functions.
(gimplify_compound_lval): WANT_LVALUE now bool.
Major rework to allow handle_component_p and initialize and
gimplify new operands for ARRAY_REF, ARRAY_RANGE_REF, and
COMPONENT_REF.
(gimplify_array_ref): Deleted.
(gimplify_self_mod_expr): WANT_VALUE now bool.
(gimplify_modify_expr): Gimplify to_p and from_p later.
Factor out code into gimplify_modify_expr_rhs and call twice.
Move variable-size code earlier and handle PLACEHOLDER_EXPR.
(gimplify_modify_expr_rhs, gimplify_variable_sized_compare): New fns.
(gimplify_addr_expr, case VIEW_CONVERT_EXPR): New case.
(gimplify_expr, case ARRAY_REF): Delete special case.
Instead handle like COMPONENT_REF; also do ARRAY_RANGE_REF,
IMAGPART, and REALPART the same way.
(gimplify_expr, case VIEW_CONVERT_EXPR): New case.
(gimplify_expr): Call gimplify_variable_sized_compare if applicable.
Call alloc_stmt_list instead of build_empty_stmt.
Deal with _REF that's volatile.
(gimplify_type_sizes, gimplify_one_sizepos): New functions.
(unshare_body, unvisit_body): New functions.
(gimplify_body): Call them.
* stmt.c (expand_stack_alloc): Don't expand TYPE_MAX_VALUE.
* stor-layout.c (get_pending_sizes): Don't change SAVE_EXPR_CONTEXT.
* tree-alias-common.c (get_alias_var): Also skip ARRAY_RANGE_REF.
* tree-cfg.c (tree_node_can_be_shared): Treat ARRAY_RANGE_REF
like ARRAY_REF.
(verify_expr, case ADDR_EXPR): Use handled_component_p.
* tree-dfa.c (get_virtual_var): Likewise.
* tree-dump.c (dequeue_and_dump, case COMPONENT_REF, ARRAY_REF):
New cases to dump new operands; likewise for ARRAY_RANGE_REF.
* tree-eh.c (tree_could_trap, case ARRAY_RANGE_REF): Like ARRAY_REF.
* tree-gimple.c (is_gimple_addr_expr_arg): Add ARRAY_RANGE_REF
and INDIRECT_REF.
(get_base_address): Use handled_component_p.
* tree-gimple.h (gimplify_type_sizes, gimplify_one_sizepos): New.
* tree-line.c (walk_tree): Walk more things for types and decls.
* tree-mudflap.c (mf_build_check_statement_for): Add new operands
for ARRAY_REF and COMPONENT_REF.
(mx_xform_derefs_1): Clean up usage of decl sizes.
* tree-nested.c (build_addr): Use handled_component_p.
(walk_stmts, case CATCH_EXPR): Add missing "break".
(get_static_chain, get_frame_field): Add new operand for COMPONENT_REF.
(finalize_nesting_tree_1): Likewise.
(convert_nonlocal_reference, case ARRAY_RANGE_REF): Like ARRAY_REF
and process additional operands.
(convert_local_reference): Likewise.
* tree-outof-ssa.c (discover_nonconstant_array_refs_r): Treat
ARRAY_RANGE_REF similarly to ARRAY_REF.
* tree-pretty-print.c (dump_generic_node, case QUAL_UNION_TYPE): Handle
like RECORD_TYPE.
(dump_generic_node, case COMPONENT_REF): Print offset operand.
(dump_generic_node, case ARRAY_RANGE_REF): Treat like ARRAY_REF
and print lower bound and element size for both.
(op_prio, case ARRAY_RANGE_REF): Like ARRAY_REF.
* tree-sra.c (csc_build_component_ref): Add new operand.
(scalarize_call_expr): Use get_base_address.
* tree-ssa-ccp.c (widen_bitfield): Clean up size handling.
(maybe_fold_offset_to_array_ref): Rework to handle input having an
ARRAY_REF, refine handling of lower bound, and add new operands
for ARRAY_REF.
(maybe_fold_to_component_ref): Add new operand for COMPONENT_REF.
(maybe_fold_stmt_indirect): Only fold *&B to B if types match.
(maybe_fold_stmt_addition): Only handle constant lower bound.
* tree-ssa-operands.c (get_expr_operands): Minor rearrangements.
Treat ARRAY_REF and ARRAY_RANGE_REF the same; look at extra operands.
Look at new offset operand of COMPONENT_REF.
* tree-ssa.c (set_is_used): Use handled_component_p.
* tree.c (substitute_in_expr, case COMPONENT_REF): Add new operand.
(stabilize_reference, case COMPONENT_REF): Likewise.
(stabilize_reference, case ARRAY_RANGE_REF, ARRAY_REF): Similarly.
(recompute_tree_invariant_for_addr_expr): Completely rework to
be more precise. Also set TREE_SIDE_EFFECTS.
(build1_stat, case ARRAY_EXPR): Don't handle TREE_SIDE_EFFECTS here.
(build2_stat, build3_stat, build4_stat): For references,
propagate TREE_THIS_VOLATILE.
(get_unwidened): Add new operand for COMPONENT_REF.
(get_narrower): Likewise; use host_integerp for DECL_SIZE.
* tree.def (COMPONENT_REF): Add new operand.
(ARRAY_REF, ARRAY_RANGE_REF): Add two new operands.
* tree.h (array_ref_element_size, array_ref_low_bound): New decls.
(component_ref_field_offset): Likewise.
* config/alpha/alpha.c (alpha_va_start): Add new op for COMPONENT_REF.
(alpha_gimplify_va_arg): Likewise.
* config/i386/i386.c (ix86_va_start, ix86_gimplify_va_arg): Likewise.
* config/i860/i860.c (i860_va_start, i860_va_arg): Likewise.
* config/iq2000/iq2000.c (iq2000_va_arg): Likewise.
* config/mips/mips.c (mips_va_start, mips_va_arg): Likewise.
* config/rs6000/rs6000.c (rs6000_va_start, rs6000_gimplify_va_arg):
Likewise.
* config/s390/s390.c (s390_va_start, s390_gimplify_va_arg): Likewise.
* config/sh/sh.c (sh_va_start, sh_va_arg): Likewise.
* config/stormy16/stormy16.c (xstormy1_expand_builin_va_start):
Likewise.
(xstormy16_expand_builtin_va_arg): Likewise.
* config/xtensa/xtensa.c (xtensa_va_start, xtensa_va_arg): Likewise.
* cp/call.c (build_vfield_ref): Add new operand for COMPONENT_REF.
(build_new_method_call): Likewise.
* cp/decl.c (local_variable_p_walkfn): Don't walk into types.
* cp/decl2.c (grok_array_decl): Add new operands for ARRAY_REF.
(build_anon_union_vars): Add new operand for COMPONENT_REF.
* cp/init.c (buld_new): Add new operand for ARRAY_REF.
* cp/method.c (do_build_copy_constructor): New op for COMPONENT_REF.
(do_build_assign_ref): Likewise.
* cp/parser.c (cp_parser_direct_new_declarator): Add new operands
for ARRAY_REF.
(cp_parser_direct_declarator): Likewise.
* cp/pt.c (tsubst): Likewise.
(tsubst_copy, tsubst_copy_and_build): Likewise; also add new operand
for COMPONENT_REF.
* cp/semantics.c (finish_non_static_data_member): Add new operand
for COMPONENT_REF.
* cp/typeck.c (build_class_member_access_expr): Likewise.
(build_class_member_access_expr, finish_class_member_access_expr):
Likewise.
(build_ptrmemfunc_access_expr): Likewise.
(build_array_ref): Add new operands for ARRAY_REF.
* cp/typeck2.c (split_nonconstant_init_1): Likewise; COMPONENT_REF too.
* cp/tree.c (count_trees_r, no_linkage_helper): Don't walk in types.
* fortran/f95-lang.c (LANG_HOOKS_GIMPLE_BEFORE_INLINING): Deleted.
* fortran/trans-array.c (gfc_conv_descriptor_data): Add operand
for COMPONENT_REF.
(gfc_conv_descriptor_offset, gfc_conv_descriptor_dtype): Likewise.
(gfc_conv_descriptor_dimension, gfc_conv_descriptor_stride): Likewise.
(gfc_conv_descriptor_lbound, gfc_conv_descriptor_ubound): Likewise.
* fortran/trans-common.c (create_common): Likewise.
* fortran/trans-expr.c (gfc_conv_component_ref): Likewise.
* fortran/trans-io.c (set_parameter_value): Likewise.
(set_parameter_ref, set_string, set_flag, io_result): Likewise.
(transfer_expr): Likewise.
* fortran/trans-decl.c (gfc_trans_auto_character_variable):
Set up to get DECL_SIZE and DECL_SIZE_UNIT gimplified.
(gfc_simplify_function): New function.
(gfc_generate_function-code): Properly handle nested functions.
* fortran/trans.c (gfc_build_array_ref): Add two new operands
for ARRAY_REF.
* java/class.c (build_class_ref): Add new operand for COMPONENT_REF.
(build_static_field_ref): Likewise and add new operands for ARRAY_REF.
* java/constants.c (build_ref_from_constant_pool): Likewise.
* java/expr.c (build_java_array_length_access): Likewise.
(build_get_class, build_field_ref, build_known_method_ref): Likewise.
(invoke_build_dtable, build_invokevirtual): Likewise.
(build_invokeinterface, java_expand_expr): Likewise.
(emit_init_test_initialization): Likewise.
* java/java-gimplify.c (java_gimplify_new_array_init): Likewise.
* java/parse.y (make_qualifed_name, build_array_ref): Likewise.
* objc/ojbc-act.c (generate_static_references): Add additional
operands to ARRAY_REF.
(generate_strings, build_method_prototype_list_template): Likewise.
(generate_protocol_list): Likewise.
From-SVN: r83474
2004-06-22 05:07:05 +02:00
|
|
|
|
/* We are making an ADDR_EXPR of ptrtype. This is a valid
|
|
|
|
|
|
ADDR_EXPR because it's the best way of representing what
|
|
|
|
|
|
happens in C when we take the address of an array and place
|
|
|
|
|
|
it in a pointer to the element type. */
|
re PR c/461 (non-lvalue arrays)
* c-common.c (c_expand_expr_stmt): Apply default conversions to
non-lvalue arrays if C99.
* c-typeck.c (default_conversion): Split out code handling
array-to-pointer and function-to-pointer conversions into a
separate default_function_array_conversion function.
(default_function_array_conversion): New function. Keep track of
whether any NON_LVALUE_EXPRs were stripped. Return non-lvalue
arrays unchanged outside C99 mode instead of giving an error for
them.
(build_component_ref): Use pedantic_non_lvalue when handling
COMPOUND_EXPR. Don't handle COND_EXPR specially.
(convert_arguments): Use default_function_array_conversion.
(build_unary_op): For ADDR_EXPR, take a flag indicating whether
non-lvalues are OK.
(unary_complex_lvalue): Likewise.
(internal_build_compound_expr): Use
default_function_array_conversion. Apply default conversions to
function in compound expression.
(build_c_cast, build_modify_expr, digest_init, build_asm_stmt):
Use default_function_array_conversion.
* doc/extend.texi: Update documentation of subscripting non-lvalue
arrays.
Fixes PR c/461.
testsuite:
* gcc.dg/c90-array-lval-1.c, gcc.dg/c90-array-lval-2.c,
gcc.dg/c99-array-lval-1.c, gcc.dg/c99-array-lval-2.c: Remove
XFAILs. Adjust expected error texts.
* gcc.c-torture/compile/20011106-1.c,
gcc.c-torture/compile/20011106-2.c, gcc.dg/c90-array-lval-3.c,
gcc.dg/c90-array-lval-4.c, gcc.dg/c90-array-lval-5.c,
gcc.dg/c99-array-lval-3.c, gcc.dg/c99-array-lval-4.c,
gcc.dg/c99-array-lval-5.c: New tests.
From-SVN: r46805
2001-11-06 13:39:36 +01:00
|
|
|
|
adr = build1 (ADDR_EXPR, ptrtype, exp);
|
c-decl.c (grokdeclarator): Update.
* c-decl.c (grokdeclarator): Update.
* c-lang.c (LANG_HOOKS_MARK_ADDRESSABLE): Redefine.
* c-tree.h (c_mark_addressable): New.
* c-typeck.c (default_function_array_conversion, build_unary_op,
build_array_ref, convert_for_assignment): Update.
(mark_addressable): Rename.
* calls.c (try_to_integrate, expand_call): Use langhook.
* expr.c (expand_expr): Use langhook.
* langhooks-def.h (LANG_HOOKS_INITIALIZER): Update.
* langhooks.h (struct lang_hooks): New hook.
* stmt.c (expand_asm_operands): Use langhook.
* tree.h (mark_addressable): Remove.
ada:
* decl.c (gnat_to_gnu_entity): Update.
* gigi.h (mark_addressable): Rename.
* misc.c (LANG_HOOKS_MARK_ADDRESSABLE): Redefine.
* trans.c (tree_transform): Update.
* utils.c (create_var_decl): Update.
* util2.c (build_binary_op, build_unary_op,
fill_vms_descriptor): Update.
(mark_addressable): Rename, update.
cp:
* call.c (build_addr_func): Update.
* class.c (resolve_address_of_overloaded_function): Update.
* cp-lang.c (LANG_HOOKS_MARK_ADDRESSABLE): Redefine.
* cp-tree.h (cxx_mark_addressable): New.
* decl.c (register_dtor_fn, cxx_maybe_build_cleanup): Update.
* decl2.c (build_cleanup): Update.
* except.c (build_throw): Update.
* init.c (resolve_offset_ref): Update.
* pt.c (convert_nontype_argument): Update.
* semantics.c (finish_asm_stmt, simplify_affr_init_exprs_r): Update.
* typeck.c (decay_conversion, build_array_ref, build_unary_op,
unary_complex_lvalue): Update.
(mark_addressable): Rename.
f:
* com.c (LANG_HOOKS_MARK_ADDRESSABLE): Redefine.
(mark_addressable): Rename.
(ffecom_arrayref_, ffecom_1): Update.
java:
* java-tree.h (java_mark_addressable): New.
* lang.c (LANG_HOOKS_MARK_ADDRESSABLE): Redefine.
* typeck.c (mark_addressable): Rename, update.
objc:
* objc-lang.c (LANG_HOOKS_MARK_ADDRESSABLE): Redefine.
From-SVN: r51705
2002-04-01 22:26:18 +02:00
|
|
|
|
if (!c_mark_addressable (exp))
|
re PR c/461 (non-lvalue arrays)
* c-common.c (c_expand_expr_stmt): Apply default conversions to
non-lvalue arrays if C99.
* c-typeck.c (default_conversion): Split out code handling
array-to-pointer and function-to-pointer conversions into a
separate default_function_array_conversion function.
(default_function_array_conversion): New function. Keep track of
whether any NON_LVALUE_EXPRs were stripped. Return non-lvalue
arrays unchanged outside C99 mode instead of giving an error for
them.
(build_component_ref): Use pedantic_non_lvalue when handling
COMPOUND_EXPR. Don't handle COND_EXPR specially.
(convert_arguments): Use default_function_array_conversion.
(build_unary_op): For ADDR_EXPR, take a flag indicating whether
non-lvalues are OK.
(unary_complex_lvalue): Likewise.
(internal_build_compound_expr): Use
default_function_array_conversion. Apply default conversions to
function in compound expression.
(build_c_cast, build_modify_expr, digest_init, build_asm_stmt):
Use default_function_array_conversion.
* doc/extend.texi: Update documentation of subscripting non-lvalue
arrays.
Fixes PR c/461.
testsuite:
* gcc.dg/c90-array-lval-1.c, gcc.dg/c90-array-lval-2.c,
gcc.dg/c99-array-lval-1.c, gcc.dg/c99-array-lval-2.c: Remove
XFAILs. Adjust expected error texts.
* gcc.c-torture/compile/20011106-1.c,
gcc.c-torture/compile/20011106-2.c, gcc.dg/c90-array-lval-3.c,
gcc.dg/c90-array-lval-4.c, gcc.dg/c90-array-lval-5.c,
gcc.dg/c99-array-lval-3.c, gcc.dg/c99-array-lval-4.c,
gcc.dg/c99-array-lval-5.c: New tests.
From-SVN: r46805
2001-11-06 13:39:36 +01:00
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
TREE_SIDE_EFFECTS (adr) = 0; /* Default would be, same as EXP. */
|
|
|
|
|
|
return adr;
|
|
|
|
|
|
}
|
|
|
|
|
|
/* This way is better for a COMPONENT_REF since it can
|
|
|
|
|
|
simplify the offset for a component. */
|
|
|
|
|
|
adr = build_unary_op (ADDR_EXPR, exp, 1);
|
|
|
|
|
|
return convert (ptrtype, adr);
|
|
|
|
|
|
}
|
|
|
|
|
|
return exp;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
1992-02-28 19:53:39 +01:00
|
|
|
|
/* Perform default promotions for C data used in expressions.
|
|
|
|
|
|
Arrays and functions are converted to pointers;
|
|
|
|
|
|
enumeral types or short or char, to int.
|
|
|
|
|
|
In addition, manifest constants symbols are replaced by their values. */
|
|
|
|
|
|
|
|
|
|
|
|
tree
|
2003-06-22 15:41:26 +02:00
|
|
|
|
default_conversion (tree exp)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2001-11-02 00:29:09 +01:00
|
|
|
|
tree orig_exp;
|
2001-10-11 05:16:15 +02:00
|
|
|
|
tree type = TREE_TYPE (exp);
|
|
|
|
|
|
enum tree_code code = TREE_CODE (type);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
re PR c/461 (non-lvalue arrays)
* c-common.c (c_expand_expr_stmt): Apply default conversions to
non-lvalue arrays if C99.
* c-typeck.c (default_conversion): Split out code handling
array-to-pointer and function-to-pointer conversions into a
separate default_function_array_conversion function.
(default_function_array_conversion): New function. Keep track of
whether any NON_LVALUE_EXPRs were stripped. Return non-lvalue
arrays unchanged outside C99 mode instead of giving an error for
them.
(build_component_ref): Use pedantic_non_lvalue when handling
COMPOUND_EXPR. Don't handle COND_EXPR specially.
(convert_arguments): Use default_function_array_conversion.
(build_unary_op): For ADDR_EXPR, take a flag indicating whether
non-lvalues are OK.
(unary_complex_lvalue): Likewise.
(internal_build_compound_expr): Use
default_function_array_conversion. Apply default conversions to
function in compound expression.
(build_c_cast, build_modify_expr, digest_init, build_asm_stmt):
Use default_function_array_conversion.
* doc/extend.texi: Update documentation of subscripting non-lvalue
arrays.
Fixes PR c/461.
testsuite:
* gcc.dg/c90-array-lval-1.c, gcc.dg/c90-array-lval-2.c,
gcc.dg/c99-array-lval-1.c, gcc.dg/c99-array-lval-2.c: Remove
XFAILs. Adjust expected error texts.
* gcc.c-torture/compile/20011106-1.c,
gcc.c-torture/compile/20011106-2.c, gcc.dg/c90-array-lval-3.c,
gcc.dg/c90-array-lval-4.c, gcc.dg/c90-array-lval-5.c,
gcc.dg/c99-array-lval-3.c, gcc.dg/c99-array-lval-4.c,
gcc.dg/c99-array-lval-5.c: New tests.
From-SVN: r46805
2001-11-06 13:39:36 +01:00
|
|
|
|
if (code == FUNCTION_TYPE || code == ARRAY_TYPE)
|
|
|
|
|
|
return default_function_array_conversion (exp);
|
|
|
|
|
|
|
1992-02-28 19:53:39 +01:00
|
|
|
|
/* Constants can be used directly unless they're not loadable. */
|
|
|
|
|
|
if (TREE_CODE (exp) == CONST_DECL)
|
|
|
|
|
|
exp = DECL_INITIAL (exp);
|
1994-08-25 00:28:40 +02:00
|
|
|
|
|
|
|
|
|
|
/* Replace a nonvolatile const static variable with its value unless
|
|
|
|
|
|
it is an array, in which case we must be sure that taking the
|
|
|
|
|
|
address of the array produces consistent results. */
|
|
|
|
|
|
else if (optimize && TREE_CODE (exp) == VAR_DECL && code != ARRAY_TYPE)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2000-10-20 17:59:07 +02:00
|
|
|
|
exp = decl_constant_value_for_broken_optimization (exp);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
type = TREE_TYPE (exp);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
1992-07-10 03:49:46 +02:00
|
|
|
|
/* Strip NON_LVALUE_EXPRs and no-op conversions, since we aren't using as
|
2003-06-22 15:41:26 +02:00
|
|
|
|
an lvalue.
|
tree.h (INT_CST_LT, [...]): Remove unneeded casts.
* tree.h (INT_CST_LT, INT_CST_LT_UNSIGNED): Remove unneeded casts.
(struct tree_int_cst): int_cst_low is now unsigned HOST_WIDE_INT.
(attribute_hash_list, type_hash_canon): hashcode is now unsigned.
(type_hash_lookup, type_hash_add, type_hash_list): Likewise.
(min_precision): Result is unsignd.
(add_double, neg_double, mul_double): Low word is unsigned.
(lshift_double, rshift_double, lrotate_double): Likewise.
(rrotate_double, div_and_round_double): Likewise.
(tree_floor_log2, compare_tree_int): New functions.
(preserve_rtl_expr_temps): New declaration.
* c-common.c (declare_hidden_char_array): Use compare_tree_int.
(decl_attributes): Use tree_log2 to find alignment.
Check for TREE_INT_CST_HIGH for format args.
(min_precision): Now unsigned.
Use tree_floor_log2.
(truthvalue_conversion): Delete long-disabled code.
* c-decl.c (finish_struct): Clean up tests on field width.
(finish_function): Use compare_tree_int.
* c-pragma.c (handle_pragma_token): Use tree_log2 for alignment.
* c-typeck.c (comptypes): Use tree_int_cst_equal.
(default_conversion, digest_init): Use compare_tree_int.
(build_binary_op): Use integer_all_onesp and compare_tree_int.
Fix type errors in forming masks.
* calls.c (initialize_argument_information): Use compare_tree_int.
* dbxout.c (dbxout_type): Cast TREE_INT_CST_LOW to HOST_WIDE_INT.
* except.c (expand_eh_region_start_tree): Use compare_tree_int.
* expr.c (is_zeros_p, case INTEGER_CST): Use integer_zerop.
(store_field): Use compare_tree_int.
(expand_expr, case CONSTRUCTOR): Use TYPE_SIZE_UNIT.
(expand_expr, case ARRAY_REF): Use compare_tree_int.
(do_jump, case BIT_AND_EXPR): Use tree_floor_log2.
(do_store_flag): Use compare_tree_int.
* fold-const.c (encode, decode): Low part is always unsigned.
(force_fit_type, add_double, neg_double, mul_double): Likewise.
(lshift_double, rshift_double, lrotate_double): Likewise.
(rrotate_double, div_and_round_double, int_const_binop): Likewise.
(fold_convert): Use compare_tree_int.
(operand_equal_p, case INTEGER_CST): Use tree_int_cst_equal.
(invert_truthvalue, case INTEGER_CST): Likewise.
(fold): Use compare_tree_int; add casts for unsigned TREE_INT_CST_LOW.
* mkdeps.c (deps_dummy_targets): Make I unsigned.
* rtl.h (add_double, neg_double, mul_double): Low words are unsigned.
(lshift_double, rshift_double, lrotate_double, rrotate_double):
Likewise.
* stmt.c (expand_decl): Use compare_tree_int and mode_for_size_tree.
(expand_end_case): Use compare_tree_int.
(estimate_case_costs): Cast TREE_INT_CST_LOW to HOST_WIDE_INT.
* stor-layout.c (mode_for_size_tree): Use compare_tree_int.
(layout_decl): Likewise.
(layout_record, layout_union): Make sizes unsigned.
(layout_type, case VOID_TYPE): TYPE_SIZE must be bitsizetype.
(layout_type, case QUAL_UNION_TYPE): Use compare_tree_int.
* tree.c (struct type_hash): hashcode is unsigned.
(build_type_attribute_variant, type_hash_list): Likewise.
(type_hash_lookup, type_hash_add, type_hash_canon): Likewise.
(attribute_hash_list, build_array_type, build_method_type): Likewise.
(build_complex_type): Likewise.
(real_value_from_int_cst): Remove unneeded casts.
(integer_all_onesp): Add casts.
(tree_floor_log2, compare_tree_int): New functions.
(build_index_type): Use tree_int_cst_sgn.
* varasm.c (assemble_variable): Use compare_tree_int.
* ch/actions.c (chill_convert_for_assignment): INDEX is unsigned
HOST_WIDE_INT.
* ch/ch-tree.h (DECL_NESTING_LEVEL): Use TREE_INT_CST_HIGH
since unsigned.
* ch/except.c (chill_handle_on_labels): ALTERNATIVE is unsigned.
Use compare_tree_int.
(expand_goto_except_cleanup): Likewise.
* cp/class.c (dfs_modify_vtables): I is now unsigned.
(check_bitfield_decl): Use tree_int_cst_sgn and compare_tree_int.
(build_base_field): Add casts of TREE_INT_CST_LOW to HOST_WIDE_INT.
* cp/error.c (dump_expr): Cast TREE_INT_CST_HIGH to unsigned.
* cp/init.c (build_vec_init): Cast TREE_INT_CST_LOW to HOST_WIDE_INT.
* cp/method.c (build_overload_int): Cast TREE_INT_CST_HIGH to unsigned.
* cp/typeck.c (build_binary_op, case TRUNC_DIV_EXPR):
Call integer_all_onesp.
* cp/typeck2.c (process_init_constructor): Use compare_tree_int.
* f/com.c (ffecom_f2c_set_lio_code_): Use compare_tree_int.
(ffecom_sym_transform_, ffecom_transform_common_): Likewise.
(ffecom_transform_equiv_): Likewise.
* java/decl.c (emit_init_test_initialization): Mark KEY as unused.
* java/expr.c (build_newarray): Cast TREE_INT_CST_LOW to HOST_WIDE_INT.
(build_anewarray): Likewise.
* java/parse.y (patch_newarray): Likewise.
* java/parse.c: Regenerated.
From-SVN: r32383
2000-03-07 12:41:32 +01:00
|
|
|
|
|
|
|
|
|
|
Do not use STRIP_NOPS here! It will remove conversions from pointer
|
1992-07-10 03:49:46 +02:00
|
|
|
|
to integer and cause infinite recursion. */
|
2001-11-02 00:29:09 +01:00
|
|
|
|
orig_exp = exp;
|
1992-07-10 03:49:46 +02:00
|
|
|
|
while (TREE_CODE (exp) == NON_LVALUE_EXPR
|
|
|
|
|
|
|| (TREE_CODE (exp) == NOP_EXPR
|
|
|
|
|
|
&& TREE_TYPE (TREE_OPERAND (exp, 0)) == TREE_TYPE (exp)))
|
|
|
|
|
|
exp = TREE_OPERAND (exp, 0);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
c-tree.h (struct c_expr): Define.
* c-tree.h (struct c_expr): Define.
(C_SET_EXP_ORIGINAL_CODE): Remove.
(parser_build_binary_op, build_compound_expr): Update prototypes.
* c-parse.in (%union): Add exprtype.
(FUNC_NAME): Mark as ttype.
(expr, expr_no_commas, cast_expr, unary_expr, primary): Change to
exprtype.
(expr): Update. Define directly in terms of expr_no_commas
instead of using nonnull_exprlist.
(nonnull_exprlist, unary_expr, cast_expr, expr_no_commas, primary,
offsetof_member_designator, typespec_nonreserved_nonattr, init,
initval, designator, component_declarator,
component_notype_declarator, enumerator, array_declarator,
condition, exexpr, switch_statement, stmt_nocomp, stmt,
nonnull_asm_operands, ivar_declarator, receiver): Update. Don't
set C_EXP_ORIGINAL_CODE. Use TREE_NO_WARNING for assignments
where appropriate.
* c-common.h (C_EXP_ORIGINAL_CODE): Remove.
* c-common.c (c_common_truthvalue_conversion): Don't check
C_EXP_ORIGINAL_CODE.
* c-typeck.c (parser_build_binary_op): Use c_expr structures.
Don't use C_EXP_ORIGINAL_CODE.
(default_conversion, default_function_array_conversion): Don't use
C_EXP_ORIGINAL_CODE. Preserve TREE_NO_WARNING.
(internal_build_compound_expr): Merge into build_compound_expr.
(build_compound_expr): Take two operands instead of a TREE_LIST.
* objc/objc-act.c (get_super_receiver): Update calls to
build_compound_expr.
cp:
* typeck.c (build_modify_expr, build_x_modify_expr): Set
TREE_NO_WARNING on assignments with an operator other than '='.
testsuite:
* g++.dg/warn/Wparentheses-1.C, g++.dg/warn/Wparentheses-2.C,
gcc.dg/Wparentheses-10.c: New tests.
* gcc.dg/Wparentheses-5.c: Remove XFAILs.
From-SVN: r84911
2004-07-19 10:38:52 +02:00
|
|
|
|
if (TREE_NO_WARNING (orig_exp))
|
|
|
|
|
|
TREE_NO_WARNING (exp) = 1;
|
2001-11-02 00:29:09 +01:00
|
|
|
|
|
1992-02-28 19:53:39 +01:00
|
|
|
|
/* Normally convert enums to int,
|
|
|
|
|
|
but convert wide enums to something wider. */
|
|
|
|
|
|
if (code == ENUMERAL_TYPE)
|
|
|
|
|
|
{
|
Makefile.in (convert.o, [...]): Update.
* Makefile.in (convert.o, calls.o, expmed.o): Update.
* attribs.c (handle_mode_attribute, handle_vector_size_attribute):
Use new hooks.
* builtin-types.def (BT_PTRMODE): Update.
* c-common.c (type_for_size): Rename c_common_type_for_size.
(type_for_mode): Similarly.
(shorten_compare, pointer_int_sum, c_common_nodes_and_builtins):
Use new hook.
* c-bommon.h (c_common_type_for_size, c_common_type_for_mode): New.
* c-decl.c (finish_enum, build_enumerator): Use new hooks.
* c-lang.c (LANG_HOOKS_TYPE_FOR_MODE, LANG_HOOKS_TYPE_FOR_SIZE):
Redefine.
* c-typeck.c (common_type, comptypes, default_conversion):
Use new hooks.
* calls.c: Include langhooks.h.
(emit_library_call_value_1): Use new hooks. Avoid redundant
calls.
* convert.c: Include langhooks.h
(convert_to_pointer, convert_to_integer): Use new hooks.
* except.c (init_eh): Similarly.
* expmed.c: Include langhooks.h.
(expand_mult_add): Use new hooks.
* expr.c (store_expr, store_constructor, expand_expr, do_jump,
try_casesi): Similarly.
* fold-const.c (optimize_bit_field_compare, make_range,
decode_field_reference, fold_truthop, fold): Similarly.
* function.c (assign_stack_local_1, assign_stack_temp_for_type,
put_var_into_stack): Similarly.
* langhooks-def.h (LANG_HOOKS_TYPE_FOR_MODE,
LANG_HOOKS_TYPE_FOR_SIZE): New.
(LANG_HOOKS_TYPES_INITIALIZER): Update.
* langhooks.h (lang_hooks_for_types): New hooks.
* stmt.c (expand_decl_cleanup, emit_case_nodes): Use new hooks.
* tree.c (get_unwidened, get_narrower): Similarly.
* tree.h (type_for_mode, type_for_size): Remove.
* varasm.c (force_const_mem): Use new hooks.
ada:
* gigi.h (type_for_size, type_for_mode): Rename.
* misc.c (LANG_HOOKS_TYPE_FOR_MODE, LANG_HOOKS_TYPE_FOR_SIZE):
Redefine.
* trans.c (tree_transform): Update.
* utils.c (gnat_init_decl_processing, init_gigi_decls,
builtin_function, float_type_for_size, signed_or_unsigned_type,
build_vms_descriptor, unchecked_convert): Update.
(type_for_mode, type_for_size): Rename.
* utils2.c (nonbinary_modular_operation): Update.
cp:
* cp-lang.c (LANG_HOOKS_TYPE_FOR_MODE, LANG_HOOKS_TYPE_FOR_SIZE):
Redefine.
* cvt.c (cp_convert_to_pointer, type_promotes_to): Use new hooks.
* decl.c (finish_enum): Similarly.
* error.c (dump_type): Similarly.
* lex.c (cxx_init): Similarly.
* mangle.c (write_builtin_type): Similarly.
* typeck.c (comptypes): Similarly.
f:
* com.c (LANG_HOOKS_TYPE_FOR_MODE, LANG_HOOKS_TYPE_FOR_SIZE):
Redefine.
(type_for_mode, type_for_size): Rename.
(signed_or_unsigned_type, signed_type, truthvalue_conversion,
unsigned_type): Use new hooks.
java:
* Make-lang.in (builtins.o): Update.
* boehm.c (get_boehm_type_descriptor): Update.
* builtins.c: Include langhooks.h.
* decl.c (java_init_decl_processing): Update.
* java-tree.h (java_type_for_mode, java_type_for_size): New.
* lang.c (LANG_HOOKS_TYPE_FOR_MODE, LANG_HOOKS_TYPE_FOR_SIaZE):
Redefine.
* typeck.c (type_for_mode, type_for_size): Update.
objc:
* objc-act.c (handle_impent): Update.
* objc-lang.c (LANG_HOOKS_TYPE_FOR_MODE, LANG_HOOKS_TYPE_FOR_SIaZE):
Redefine.
From-SVN: r51571
2002-03-29 22:46:27 +01:00
|
|
|
|
type = c_common_type_for_size (MAX (TYPE_PRECISION (type),
|
|
|
|
|
|
TYPE_PRECISION (integer_type_node)),
|
|
|
|
|
|
((TYPE_PRECISION (type)
|
|
|
|
|
|
>= TYPE_PRECISION (integer_type_node))
|
builtins.c, [...]: Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* builtins.c, c-aux-info.c, c-common.c, c-cppbuiltin.c, c-decl.c:
Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* c-format.c, c-opts.c, c-pretty-print.c, c-typeck.c: Likewise.
* calls.c, convert.c, dbxout.c, dojump.c, dwarf2out.c: Likewise.
* expmed.c, expr.c, fold-const.c, function.c, integrate.c: Likewise.
* optabs.c, sdbout.c, stmt.c, stor-layout.c, tree-dump.c: Likewise.
* tree.c, config/iq2000/iq2000.c, config/m32r/m32r.c: Likewise.
* config/mips/mips.c, config/rs6000/rs6000.c: Likewise.
* config/s390/s390.c, config/sparc/sparc.c, objc/objc-act.c: Likewise.
* stor-layout.c (layout_type, case COMPLEX_TYPE): Test for
REAL_TYPE, not INTEGER_TYPE.
(layout_type, case VECTOR_TYPE): Simplify code.
* tree.c (build_vector_type_for_mode): Remove dup unsigned setting.
* tree.h: Update comments.
(STRIP_NOPS): Use TYPE_UNSIGNED.
(TYPE_UNSIGNED): New macro.
(TYPE_TRAP_SIGNED): Remove now redundant check.
(SAVE_EXPR_NOPLACEHOLDER): Don't use TREE_UNSIGNED.
* cp/call.c (joust): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* cp/class.c (check_bitfield_decl): Likewise.
* cp/cvt.c (type_promotes_to): Likewise.
* cp/decl.c (finish_enum): Likewise.
* cp/mangle.c (write_builtin_type): Likewise.
* cp/semantics.c (finish_switch_cond, finish_unary_op_expr): Likewise.
* cp/typeck.c (type_after_usual_arithmetic_conversions): Likewise.
(build_binary_op): Likewise.
* f/com.c (ffecom_arrayref_): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
(ffecom_expr_): Likewise.
* java/jcf-write.c (generate_bytecode_insns): Use TYPE_UNSIGNED.
* treelang/treetree.c (tree_lang_signed_or_unsigned_type):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/decl.c (gnat_to_gnu_entity, make_type_from_size):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/trans.c (tree_transform, convert_with_check): Likewise.
* ada/utils.c (gnat_signed_or_unsigned_type): Likewise.
(build_vms_descriptor, unchecked_convert): Likewise.
* ada/utils2.c (nonbinary_modular_operation): Likewise.
From-SVN: r80287
2004-04-01 05:50:43 +02:00
|
|
|
|
&& TYPE_UNSIGNED (type)));
|
tree.h (INT_CST_LT, [...]): Remove unneeded casts.
* tree.h (INT_CST_LT, INT_CST_LT_UNSIGNED): Remove unneeded casts.
(struct tree_int_cst): int_cst_low is now unsigned HOST_WIDE_INT.
(attribute_hash_list, type_hash_canon): hashcode is now unsigned.
(type_hash_lookup, type_hash_add, type_hash_list): Likewise.
(min_precision): Result is unsignd.
(add_double, neg_double, mul_double): Low word is unsigned.
(lshift_double, rshift_double, lrotate_double): Likewise.
(rrotate_double, div_and_round_double): Likewise.
(tree_floor_log2, compare_tree_int): New functions.
(preserve_rtl_expr_temps): New declaration.
* c-common.c (declare_hidden_char_array): Use compare_tree_int.
(decl_attributes): Use tree_log2 to find alignment.
Check for TREE_INT_CST_HIGH for format args.
(min_precision): Now unsigned.
Use tree_floor_log2.
(truthvalue_conversion): Delete long-disabled code.
* c-decl.c (finish_struct): Clean up tests on field width.
(finish_function): Use compare_tree_int.
* c-pragma.c (handle_pragma_token): Use tree_log2 for alignment.
* c-typeck.c (comptypes): Use tree_int_cst_equal.
(default_conversion, digest_init): Use compare_tree_int.
(build_binary_op): Use integer_all_onesp and compare_tree_int.
Fix type errors in forming masks.
* calls.c (initialize_argument_information): Use compare_tree_int.
* dbxout.c (dbxout_type): Cast TREE_INT_CST_LOW to HOST_WIDE_INT.
* except.c (expand_eh_region_start_tree): Use compare_tree_int.
* expr.c (is_zeros_p, case INTEGER_CST): Use integer_zerop.
(store_field): Use compare_tree_int.
(expand_expr, case CONSTRUCTOR): Use TYPE_SIZE_UNIT.
(expand_expr, case ARRAY_REF): Use compare_tree_int.
(do_jump, case BIT_AND_EXPR): Use tree_floor_log2.
(do_store_flag): Use compare_tree_int.
* fold-const.c (encode, decode): Low part is always unsigned.
(force_fit_type, add_double, neg_double, mul_double): Likewise.
(lshift_double, rshift_double, lrotate_double): Likewise.
(rrotate_double, div_and_round_double, int_const_binop): Likewise.
(fold_convert): Use compare_tree_int.
(operand_equal_p, case INTEGER_CST): Use tree_int_cst_equal.
(invert_truthvalue, case INTEGER_CST): Likewise.
(fold): Use compare_tree_int; add casts for unsigned TREE_INT_CST_LOW.
* mkdeps.c (deps_dummy_targets): Make I unsigned.
* rtl.h (add_double, neg_double, mul_double): Low words are unsigned.
(lshift_double, rshift_double, lrotate_double, rrotate_double):
Likewise.
* stmt.c (expand_decl): Use compare_tree_int and mode_for_size_tree.
(expand_end_case): Use compare_tree_int.
(estimate_case_costs): Cast TREE_INT_CST_LOW to HOST_WIDE_INT.
* stor-layout.c (mode_for_size_tree): Use compare_tree_int.
(layout_decl): Likewise.
(layout_record, layout_union): Make sizes unsigned.
(layout_type, case VOID_TYPE): TYPE_SIZE must be bitsizetype.
(layout_type, case QUAL_UNION_TYPE): Use compare_tree_int.
* tree.c (struct type_hash): hashcode is unsigned.
(build_type_attribute_variant, type_hash_list): Likewise.
(type_hash_lookup, type_hash_add, type_hash_canon): Likewise.
(attribute_hash_list, build_array_type, build_method_type): Likewise.
(build_complex_type): Likewise.
(real_value_from_int_cst): Remove unneeded casts.
(integer_all_onesp): Add casts.
(tree_floor_log2, compare_tree_int): New functions.
(build_index_type): Use tree_int_cst_sgn.
* varasm.c (assemble_variable): Use compare_tree_int.
* ch/actions.c (chill_convert_for_assignment): INDEX is unsigned
HOST_WIDE_INT.
* ch/ch-tree.h (DECL_NESTING_LEVEL): Use TREE_INT_CST_HIGH
since unsigned.
* ch/except.c (chill_handle_on_labels): ALTERNATIVE is unsigned.
Use compare_tree_int.
(expand_goto_except_cleanup): Likewise.
* cp/class.c (dfs_modify_vtables): I is now unsigned.
(check_bitfield_decl): Use tree_int_cst_sgn and compare_tree_int.
(build_base_field): Add casts of TREE_INT_CST_LOW to HOST_WIDE_INT.
* cp/error.c (dump_expr): Cast TREE_INT_CST_HIGH to unsigned.
* cp/init.c (build_vec_init): Cast TREE_INT_CST_LOW to HOST_WIDE_INT.
* cp/method.c (build_overload_int): Cast TREE_INT_CST_HIGH to unsigned.
* cp/typeck.c (build_binary_op, case TRUNC_DIV_EXPR):
Call integer_all_onesp.
* cp/typeck2.c (process_init_constructor): Use compare_tree_int.
* f/com.c (ffecom_f2c_set_lio_code_): Use compare_tree_int.
(ffecom_sym_transform_, ffecom_transform_common_): Likewise.
(ffecom_transform_equiv_): Likewise.
* java/decl.c (emit_init_test_initialization): Mark KEY as unused.
* java/expr.c (build_newarray): Cast TREE_INT_CST_LOW to HOST_WIDE_INT.
(build_anewarray): Likewise.
* java/parse.y (patch_newarray): Likewise.
* java/parse.c: Regenerated.
From-SVN: r32383
2000-03-07 12:41:32 +01:00
|
|
|
|
|
1992-02-28 19:53:39 +01:00
|
|
|
|
return convert (type, exp);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
1996-07-03 23:34:57 +02:00
|
|
|
|
if (TREE_CODE (exp) == COMPONENT_REF
|
tree.h (INT_CST_LT, [...]): Remove unneeded casts.
* tree.h (INT_CST_LT, INT_CST_LT_UNSIGNED): Remove unneeded casts.
(struct tree_int_cst): int_cst_low is now unsigned HOST_WIDE_INT.
(attribute_hash_list, type_hash_canon): hashcode is now unsigned.
(type_hash_lookup, type_hash_add, type_hash_list): Likewise.
(min_precision): Result is unsignd.
(add_double, neg_double, mul_double): Low word is unsigned.
(lshift_double, rshift_double, lrotate_double): Likewise.
(rrotate_double, div_and_round_double): Likewise.
(tree_floor_log2, compare_tree_int): New functions.
(preserve_rtl_expr_temps): New declaration.
* c-common.c (declare_hidden_char_array): Use compare_tree_int.
(decl_attributes): Use tree_log2 to find alignment.
Check for TREE_INT_CST_HIGH for format args.
(min_precision): Now unsigned.
Use tree_floor_log2.
(truthvalue_conversion): Delete long-disabled code.
* c-decl.c (finish_struct): Clean up tests on field width.
(finish_function): Use compare_tree_int.
* c-pragma.c (handle_pragma_token): Use tree_log2 for alignment.
* c-typeck.c (comptypes): Use tree_int_cst_equal.
(default_conversion, digest_init): Use compare_tree_int.
(build_binary_op): Use integer_all_onesp and compare_tree_int.
Fix type errors in forming masks.
* calls.c (initialize_argument_information): Use compare_tree_int.
* dbxout.c (dbxout_type): Cast TREE_INT_CST_LOW to HOST_WIDE_INT.
* except.c (expand_eh_region_start_tree): Use compare_tree_int.
* expr.c (is_zeros_p, case INTEGER_CST): Use integer_zerop.
(store_field): Use compare_tree_int.
(expand_expr, case CONSTRUCTOR): Use TYPE_SIZE_UNIT.
(expand_expr, case ARRAY_REF): Use compare_tree_int.
(do_jump, case BIT_AND_EXPR): Use tree_floor_log2.
(do_store_flag): Use compare_tree_int.
* fold-const.c (encode, decode): Low part is always unsigned.
(force_fit_type, add_double, neg_double, mul_double): Likewise.
(lshift_double, rshift_double, lrotate_double): Likewise.
(rrotate_double, div_and_round_double, int_const_binop): Likewise.
(fold_convert): Use compare_tree_int.
(operand_equal_p, case INTEGER_CST): Use tree_int_cst_equal.
(invert_truthvalue, case INTEGER_CST): Likewise.
(fold): Use compare_tree_int; add casts for unsigned TREE_INT_CST_LOW.
* mkdeps.c (deps_dummy_targets): Make I unsigned.
* rtl.h (add_double, neg_double, mul_double): Low words are unsigned.
(lshift_double, rshift_double, lrotate_double, rrotate_double):
Likewise.
* stmt.c (expand_decl): Use compare_tree_int and mode_for_size_tree.
(expand_end_case): Use compare_tree_int.
(estimate_case_costs): Cast TREE_INT_CST_LOW to HOST_WIDE_INT.
* stor-layout.c (mode_for_size_tree): Use compare_tree_int.
(layout_decl): Likewise.
(layout_record, layout_union): Make sizes unsigned.
(layout_type, case VOID_TYPE): TYPE_SIZE must be bitsizetype.
(layout_type, case QUAL_UNION_TYPE): Use compare_tree_int.
* tree.c (struct type_hash): hashcode is unsigned.
(build_type_attribute_variant, type_hash_list): Likewise.
(type_hash_lookup, type_hash_add, type_hash_canon): Likewise.
(attribute_hash_list, build_array_type, build_method_type): Likewise.
(build_complex_type): Likewise.
(real_value_from_int_cst): Remove unneeded casts.
(integer_all_onesp): Add casts.
(tree_floor_log2, compare_tree_int): New functions.
(build_index_type): Use tree_int_cst_sgn.
* varasm.c (assemble_variable): Use compare_tree_int.
* ch/actions.c (chill_convert_for_assignment): INDEX is unsigned
HOST_WIDE_INT.
* ch/ch-tree.h (DECL_NESTING_LEVEL): Use TREE_INT_CST_HIGH
since unsigned.
* ch/except.c (chill_handle_on_labels): ALTERNATIVE is unsigned.
Use compare_tree_int.
(expand_goto_except_cleanup): Likewise.
* cp/class.c (dfs_modify_vtables): I is now unsigned.
(check_bitfield_decl): Use tree_int_cst_sgn and compare_tree_int.
(build_base_field): Add casts of TREE_INT_CST_LOW to HOST_WIDE_INT.
* cp/error.c (dump_expr): Cast TREE_INT_CST_HIGH to unsigned.
* cp/init.c (build_vec_init): Cast TREE_INT_CST_LOW to HOST_WIDE_INT.
* cp/method.c (build_overload_int): Cast TREE_INT_CST_HIGH to unsigned.
* cp/typeck.c (build_binary_op, case TRUNC_DIV_EXPR):
Call integer_all_onesp.
* cp/typeck2.c (process_init_constructor): Use compare_tree_int.
* f/com.c (ffecom_f2c_set_lio_code_): Use compare_tree_int.
(ffecom_sym_transform_, ffecom_transform_common_): Likewise.
(ffecom_transform_equiv_): Likewise.
* java/decl.c (emit_init_test_initialization): Mark KEY as unused.
* java/expr.c (build_newarray): Cast TREE_INT_CST_LOW to HOST_WIDE_INT.
(build_anewarray): Likewise.
* java/parse.y (patch_newarray): Likewise.
* java/parse.c: Regenerated.
From-SVN: r32383
2000-03-07 12:41:32 +01:00
|
|
|
|
&& DECL_C_BIT_FIELD (TREE_OPERAND (exp, 1))
|
1997-08-02 20:15:29 +02:00
|
|
|
|
/* If it's thinner than an int, promote it like a
|
2001-05-01 01:59:10 +02:00
|
|
|
|
c_promoting_integer_type_p, otherwise leave it alone. */
|
tree.h (INT_CST_LT, [...]): Remove unneeded casts.
* tree.h (INT_CST_LT, INT_CST_LT_UNSIGNED): Remove unneeded casts.
(struct tree_int_cst): int_cst_low is now unsigned HOST_WIDE_INT.
(attribute_hash_list, type_hash_canon): hashcode is now unsigned.
(type_hash_lookup, type_hash_add, type_hash_list): Likewise.
(min_precision): Result is unsignd.
(add_double, neg_double, mul_double): Low word is unsigned.
(lshift_double, rshift_double, lrotate_double): Likewise.
(rrotate_double, div_and_round_double): Likewise.
(tree_floor_log2, compare_tree_int): New functions.
(preserve_rtl_expr_temps): New declaration.
* c-common.c (declare_hidden_char_array): Use compare_tree_int.
(decl_attributes): Use tree_log2 to find alignment.
Check for TREE_INT_CST_HIGH for format args.
(min_precision): Now unsigned.
Use tree_floor_log2.
(truthvalue_conversion): Delete long-disabled code.
* c-decl.c (finish_struct): Clean up tests on field width.
(finish_function): Use compare_tree_int.
* c-pragma.c (handle_pragma_token): Use tree_log2 for alignment.
* c-typeck.c (comptypes): Use tree_int_cst_equal.
(default_conversion, digest_init): Use compare_tree_int.
(build_binary_op): Use integer_all_onesp and compare_tree_int.
Fix type errors in forming masks.
* calls.c (initialize_argument_information): Use compare_tree_int.
* dbxout.c (dbxout_type): Cast TREE_INT_CST_LOW to HOST_WIDE_INT.
* except.c (expand_eh_region_start_tree): Use compare_tree_int.
* expr.c (is_zeros_p, case INTEGER_CST): Use integer_zerop.
(store_field): Use compare_tree_int.
(expand_expr, case CONSTRUCTOR): Use TYPE_SIZE_UNIT.
(expand_expr, case ARRAY_REF): Use compare_tree_int.
(do_jump, case BIT_AND_EXPR): Use tree_floor_log2.
(do_store_flag): Use compare_tree_int.
* fold-const.c (encode, decode): Low part is always unsigned.
(force_fit_type, add_double, neg_double, mul_double): Likewise.
(lshift_double, rshift_double, lrotate_double): Likewise.
(rrotate_double, div_and_round_double, int_const_binop): Likewise.
(fold_convert): Use compare_tree_int.
(operand_equal_p, case INTEGER_CST): Use tree_int_cst_equal.
(invert_truthvalue, case INTEGER_CST): Likewise.
(fold): Use compare_tree_int; add casts for unsigned TREE_INT_CST_LOW.
* mkdeps.c (deps_dummy_targets): Make I unsigned.
* rtl.h (add_double, neg_double, mul_double): Low words are unsigned.
(lshift_double, rshift_double, lrotate_double, rrotate_double):
Likewise.
* stmt.c (expand_decl): Use compare_tree_int and mode_for_size_tree.
(expand_end_case): Use compare_tree_int.
(estimate_case_costs): Cast TREE_INT_CST_LOW to HOST_WIDE_INT.
* stor-layout.c (mode_for_size_tree): Use compare_tree_int.
(layout_decl): Likewise.
(layout_record, layout_union): Make sizes unsigned.
(layout_type, case VOID_TYPE): TYPE_SIZE must be bitsizetype.
(layout_type, case QUAL_UNION_TYPE): Use compare_tree_int.
* tree.c (struct type_hash): hashcode is unsigned.
(build_type_attribute_variant, type_hash_list): Likewise.
(type_hash_lookup, type_hash_add, type_hash_canon): Likewise.
(attribute_hash_list, build_array_type, build_method_type): Likewise.
(build_complex_type): Likewise.
(real_value_from_int_cst): Remove unneeded casts.
(integer_all_onesp): Add casts.
(tree_floor_log2, compare_tree_int): New functions.
(build_index_type): Use tree_int_cst_sgn.
* varasm.c (assemble_variable): Use compare_tree_int.
* ch/actions.c (chill_convert_for_assignment): INDEX is unsigned
HOST_WIDE_INT.
* ch/ch-tree.h (DECL_NESTING_LEVEL): Use TREE_INT_CST_HIGH
since unsigned.
* ch/except.c (chill_handle_on_labels): ALTERNATIVE is unsigned.
Use compare_tree_int.
(expand_goto_except_cleanup): Likewise.
* cp/class.c (dfs_modify_vtables): I is now unsigned.
(check_bitfield_decl): Use tree_int_cst_sgn and compare_tree_int.
(build_base_field): Add casts of TREE_INT_CST_LOW to HOST_WIDE_INT.
* cp/error.c (dump_expr): Cast TREE_INT_CST_HIGH to unsigned.
* cp/init.c (build_vec_init): Cast TREE_INT_CST_LOW to HOST_WIDE_INT.
* cp/method.c (build_overload_int): Cast TREE_INT_CST_HIGH to unsigned.
* cp/typeck.c (build_binary_op, case TRUNC_DIV_EXPR):
Call integer_all_onesp.
* cp/typeck2.c (process_init_constructor): Use compare_tree_int.
* f/com.c (ffecom_f2c_set_lio_code_): Use compare_tree_int.
(ffecom_sym_transform_, ffecom_transform_common_): Likewise.
(ffecom_transform_equiv_): Likewise.
* java/decl.c (emit_init_test_initialization): Mark KEY as unused.
* java/expr.c (build_newarray): Cast TREE_INT_CST_LOW to HOST_WIDE_INT.
(build_anewarray): Likewise.
* java/parse.y (patch_newarray): Likewise.
* java/parse.c: Regenerated.
From-SVN: r32383
2000-03-07 12:41:32 +01:00
|
|
|
|
&& 0 > compare_tree_int (DECL_SIZE (TREE_OPERAND (exp, 1)),
|
|
|
|
|
|
TYPE_PRECISION (integer_type_node)))
|
c-common.c, [...]: Delete code implementing -traditional mode.
* c-common.c, c-common.h, c-decl.c, c-lex.c, c-parse.in,
c-tree.h, c-typeck.c, cppexp.c, cpplex.c, cpplib.c, cpplib.h,
cppmacro.c, objc/lang-specs.h, objc/objc-act.c,
builtin-types.def, builtins.def, dwarf2out.c, dwarfout.c,
gcc.c, toplev.c: Delete code implementing -traditional mode.
* ada/misc.c, ch/ch-tree.h, ch/decl.c, cp/decl2.c, f/com.c,
f/lex.c, f/top.c, java/builtins.c, java/decl.c: Delete
traditional-mode-related code copied from the C front end
but not used, or used only to permit the compiler to link.
* doc/bugreport.texi, doc/cpp.texi, doc/extend.texi,
doc/invoke.texi, doc/standards.texi, doc/trouble.texi:
Document removal of -traditional mode for compilation, and
remove documentation only relevant to that mode.
* config/nextstep.h, config/ptx4.h, config/svr4.h,
config/convex/convex.h, config/d30v/d30v.h,
config/i386/dgux.h, config/i386/osf1elf.h,
config/i386/osfelf.h, config/i386/osfrose.h,
config/i386/sco5.h, config/i386/sol2.h, config/m68k/a-ux.h,
config/m68k/hp310.h, config/m88k/dgux.h,
config/m88k/dguxbcs.h, config/m88k/luna.h, config/m88k/m88k.c,
config/m88k/m88k.h, config/m88k/openbsd.h,
config/mips/abi64.h, config/mips/osfrose.h,
config/mips/svr4-5.h, config/mips/svr4-t.h,
config/sparc/sol2-sld-64.h, config/sparc/sol2.h,
config/stormy16/stormy16.h: Remove all references to
-traditional from target specs. Delete all mention of the
no-longer-necessary TRADITIONAL_RETURN_FLOAT macro. Also
delete a couple of commented-out definitions of
DOLLARS_IN_IDENTIFIERS, with (incorrect) commentary referring
to -traditional.
* system.h: Poison TRADITIONAL_RETURN_FLOAT.
* doc/tm.texi: Remove mention of TRADITIONAL_RETURN_FLOAT macro.
* testsuite/gcc.c-torture/execute/920730-1t.c,
testsuite/gcc.c-torture/execute/920730-1t.x,
testsuite/gcc.dg/ext-glob.c: Delete test cases, only relevant
to -traditional.
From-SVN: r50110
2002-02-27 19:48:07 +01:00
|
|
|
|
return convert (integer_type_node, exp);
|
1996-07-03 23:34:57 +02:00
|
|
|
|
|
2001-05-01 01:59:10 +02:00
|
|
|
|
if (c_promoting_integer_type_p (type))
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
c-common.c, [...]: Delete code implementing -traditional mode.
* c-common.c, c-common.h, c-decl.c, c-lex.c, c-parse.in,
c-tree.h, c-typeck.c, cppexp.c, cpplex.c, cpplib.c, cpplib.h,
cppmacro.c, objc/lang-specs.h, objc/objc-act.c,
builtin-types.def, builtins.def, dwarf2out.c, dwarfout.c,
gcc.c, toplev.c: Delete code implementing -traditional mode.
* ada/misc.c, ch/ch-tree.h, ch/decl.c, cp/decl2.c, f/com.c,
f/lex.c, f/top.c, java/builtins.c, java/decl.c: Delete
traditional-mode-related code copied from the C front end
but not used, or used only to permit the compiler to link.
* doc/bugreport.texi, doc/cpp.texi, doc/extend.texi,
doc/invoke.texi, doc/standards.texi, doc/trouble.texi:
Document removal of -traditional mode for compilation, and
remove documentation only relevant to that mode.
* config/nextstep.h, config/ptx4.h, config/svr4.h,
config/convex/convex.h, config/d30v/d30v.h,
config/i386/dgux.h, config/i386/osf1elf.h,
config/i386/osfelf.h, config/i386/osfrose.h,
config/i386/sco5.h, config/i386/sol2.h, config/m68k/a-ux.h,
config/m68k/hp310.h, config/m88k/dgux.h,
config/m88k/dguxbcs.h, config/m88k/luna.h, config/m88k/m88k.c,
config/m88k/m88k.h, config/m88k/openbsd.h,
config/mips/abi64.h, config/mips/osfrose.h,
config/mips/svr4-5.h, config/mips/svr4-t.h,
config/sparc/sol2-sld-64.h, config/sparc/sol2.h,
config/stormy16/stormy16.h: Remove all references to
-traditional from target specs. Delete all mention of the
no-longer-necessary TRADITIONAL_RETURN_FLOAT macro. Also
delete a couple of commented-out definitions of
DOLLARS_IN_IDENTIFIERS, with (incorrect) commentary referring
to -traditional.
* system.h: Poison TRADITIONAL_RETURN_FLOAT.
* doc/tm.texi: Remove mention of TRADITIONAL_RETURN_FLOAT macro.
* testsuite/gcc.c-torture/execute/920730-1t.c,
testsuite/gcc.c-torture/execute/920730-1t.x,
testsuite/gcc.dg/ext-glob.c: Delete test cases, only relevant
to -traditional.
From-SVN: r50110
2002-02-27 19:48:07 +01:00
|
|
|
|
/* Preserve unsignedness if not really getting any wider. */
|
builtins.c, [...]: Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* builtins.c, c-aux-info.c, c-common.c, c-cppbuiltin.c, c-decl.c:
Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* c-format.c, c-opts.c, c-pretty-print.c, c-typeck.c: Likewise.
* calls.c, convert.c, dbxout.c, dojump.c, dwarf2out.c: Likewise.
* expmed.c, expr.c, fold-const.c, function.c, integrate.c: Likewise.
* optabs.c, sdbout.c, stmt.c, stor-layout.c, tree-dump.c: Likewise.
* tree.c, config/iq2000/iq2000.c, config/m32r/m32r.c: Likewise.
* config/mips/mips.c, config/rs6000/rs6000.c: Likewise.
* config/s390/s390.c, config/sparc/sparc.c, objc/objc-act.c: Likewise.
* stor-layout.c (layout_type, case COMPLEX_TYPE): Test for
REAL_TYPE, not INTEGER_TYPE.
(layout_type, case VECTOR_TYPE): Simplify code.
* tree.c (build_vector_type_for_mode): Remove dup unsigned setting.
* tree.h: Update comments.
(STRIP_NOPS): Use TYPE_UNSIGNED.
(TYPE_UNSIGNED): New macro.
(TYPE_TRAP_SIGNED): Remove now redundant check.
(SAVE_EXPR_NOPLACEHOLDER): Don't use TREE_UNSIGNED.
* cp/call.c (joust): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* cp/class.c (check_bitfield_decl): Likewise.
* cp/cvt.c (type_promotes_to): Likewise.
* cp/decl.c (finish_enum): Likewise.
* cp/mangle.c (write_builtin_type): Likewise.
* cp/semantics.c (finish_switch_cond, finish_unary_op_expr): Likewise.
* cp/typeck.c (type_after_usual_arithmetic_conversions): Likewise.
(build_binary_op): Likewise.
* f/com.c (ffecom_arrayref_): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
(ffecom_expr_): Likewise.
* java/jcf-write.c (generate_bytecode_insns): Use TYPE_UNSIGNED.
* treelang/treetree.c (tree_lang_signed_or_unsigned_type):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/decl.c (gnat_to_gnu_entity, make_type_from_size):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/trans.c (tree_transform, convert_with_check): Likewise.
* ada/utils.c (gnat_signed_or_unsigned_type): Likewise.
(build_vms_descriptor, unchecked_convert): Likewise.
* ada/utils2.c (nonbinary_modular_operation): Likewise.
From-SVN: r80287
2004-04-01 05:50:43 +02:00
|
|
|
|
if (TYPE_UNSIGNED (type)
|
c-common.c, [...]: Delete code implementing -traditional mode.
* c-common.c, c-common.h, c-decl.c, c-lex.c, c-parse.in,
c-tree.h, c-typeck.c, cppexp.c, cpplex.c, cpplib.c, cpplib.h,
cppmacro.c, objc/lang-specs.h, objc/objc-act.c,
builtin-types.def, builtins.def, dwarf2out.c, dwarfout.c,
gcc.c, toplev.c: Delete code implementing -traditional mode.
* ada/misc.c, ch/ch-tree.h, ch/decl.c, cp/decl2.c, f/com.c,
f/lex.c, f/top.c, java/builtins.c, java/decl.c: Delete
traditional-mode-related code copied from the C front end
but not used, or used only to permit the compiler to link.
* doc/bugreport.texi, doc/cpp.texi, doc/extend.texi,
doc/invoke.texi, doc/standards.texi, doc/trouble.texi:
Document removal of -traditional mode for compilation, and
remove documentation only relevant to that mode.
* config/nextstep.h, config/ptx4.h, config/svr4.h,
config/convex/convex.h, config/d30v/d30v.h,
config/i386/dgux.h, config/i386/osf1elf.h,
config/i386/osfelf.h, config/i386/osfrose.h,
config/i386/sco5.h, config/i386/sol2.h, config/m68k/a-ux.h,
config/m68k/hp310.h, config/m88k/dgux.h,
config/m88k/dguxbcs.h, config/m88k/luna.h, config/m88k/m88k.c,
config/m88k/m88k.h, config/m88k/openbsd.h,
config/mips/abi64.h, config/mips/osfrose.h,
config/mips/svr4-5.h, config/mips/svr4-t.h,
config/sparc/sol2-sld-64.h, config/sparc/sol2.h,
config/stormy16/stormy16.h: Remove all references to
-traditional from target specs. Delete all mention of the
no-longer-necessary TRADITIONAL_RETURN_FLOAT macro. Also
delete a couple of commented-out definitions of
DOLLARS_IN_IDENTIFIERS, with (incorrect) commentary referring
to -traditional.
* system.h: Poison TRADITIONAL_RETURN_FLOAT.
* doc/tm.texi: Remove mention of TRADITIONAL_RETURN_FLOAT macro.
* testsuite/gcc.c-torture/execute/920730-1t.c,
testsuite/gcc.c-torture/execute/920730-1t.x,
testsuite/gcc.dg/ext-glob.c: Delete test cases, only relevant
to -traditional.
From-SVN: r50110
2002-02-27 19:48:07 +01:00
|
|
|
|
&& TYPE_PRECISION (type) == TYPE_PRECISION (integer_type_node))
|
1992-02-28 19:53:39 +01:00
|
|
|
|
return convert (unsigned_type_node, exp);
|
tree.h (INT_CST_LT, [...]): Remove unneeded casts.
* tree.h (INT_CST_LT, INT_CST_LT_UNSIGNED): Remove unneeded casts.
(struct tree_int_cst): int_cst_low is now unsigned HOST_WIDE_INT.
(attribute_hash_list, type_hash_canon): hashcode is now unsigned.
(type_hash_lookup, type_hash_add, type_hash_list): Likewise.
(min_precision): Result is unsignd.
(add_double, neg_double, mul_double): Low word is unsigned.
(lshift_double, rshift_double, lrotate_double): Likewise.
(rrotate_double, div_and_round_double): Likewise.
(tree_floor_log2, compare_tree_int): New functions.
(preserve_rtl_expr_temps): New declaration.
* c-common.c (declare_hidden_char_array): Use compare_tree_int.
(decl_attributes): Use tree_log2 to find alignment.
Check for TREE_INT_CST_HIGH for format args.
(min_precision): Now unsigned.
Use tree_floor_log2.
(truthvalue_conversion): Delete long-disabled code.
* c-decl.c (finish_struct): Clean up tests on field width.
(finish_function): Use compare_tree_int.
* c-pragma.c (handle_pragma_token): Use tree_log2 for alignment.
* c-typeck.c (comptypes): Use tree_int_cst_equal.
(default_conversion, digest_init): Use compare_tree_int.
(build_binary_op): Use integer_all_onesp and compare_tree_int.
Fix type errors in forming masks.
* calls.c (initialize_argument_information): Use compare_tree_int.
* dbxout.c (dbxout_type): Cast TREE_INT_CST_LOW to HOST_WIDE_INT.
* except.c (expand_eh_region_start_tree): Use compare_tree_int.
* expr.c (is_zeros_p, case INTEGER_CST): Use integer_zerop.
(store_field): Use compare_tree_int.
(expand_expr, case CONSTRUCTOR): Use TYPE_SIZE_UNIT.
(expand_expr, case ARRAY_REF): Use compare_tree_int.
(do_jump, case BIT_AND_EXPR): Use tree_floor_log2.
(do_store_flag): Use compare_tree_int.
* fold-const.c (encode, decode): Low part is always unsigned.
(force_fit_type, add_double, neg_double, mul_double): Likewise.
(lshift_double, rshift_double, lrotate_double): Likewise.
(rrotate_double, div_and_round_double, int_const_binop): Likewise.
(fold_convert): Use compare_tree_int.
(operand_equal_p, case INTEGER_CST): Use tree_int_cst_equal.
(invert_truthvalue, case INTEGER_CST): Likewise.
(fold): Use compare_tree_int; add casts for unsigned TREE_INT_CST_LOW.
* mkdeps.c (deps_dummy_targets): Make I unsigned.
* rtl.h (add_double, neg_double, mul_double): Low words are unsigned.
(lshift_double, rshift_double, lrotate_double, rrotate_double):
Likewise.
* stmt.c (expand_decl): Use compare_tree_int and mode_for_size_tree.
(expand_end_case): Use compare_tree_int.
(estimate_case_costs): Cast TREE_INT_CST_LOW to HOST_WIDE_INT.
* stor-layout.c (mode_for_size_tree): Use compare_tree_int.
(layout_decl): Likewise.
(layout_record, layout_union): Make sizes unsigned.
(layout_type, case VOID_TYPE): TYPE_SIZE must be bitsizetype.
(layout_type, case QUAL_UNION_TYPE): Use compare_tree_int.
* tree.c (struct type_hash): hashcode is unsigned.
(build_type_attribute_variant, type_hash_list): Likewise.
(type_hash_lookup, type_hash_add, type_hash_canon): Likewise.
(attribute_hash_list, build_array_type, build_method_type): Likewise.
(build_complex_type): Likewise.
(real_value_from_int_cst): Remove unneeded casts.
(integer_all_onesp): Add casts.
(tree_floor_log2, compare_tree_int): New functions.
(build_index_type): Use tree_int_cst_sgn.
* varasm.c (assemble_variable): Use compare_tree_int.
* ch/actions.c (chill_convert_for_assignment): INDEX is unsigned
HOST_WIDE_INT.
* ch/ch-tree.h (DECL_NESTING_LEVEL): Use TREE_INT_CST_HIGH
since unsigned.
* ch/except.c (chill_handle_on_labels): ALTERNATIVE is unsigned.
Use compare_tree_int.
(expand_goto_except_cleanup): Likewise.
* cp/class.c (dfs_modify_vtables): I is now unsigned.
(check_bitfield_decl): Use tree_int_cst_sgn and compare_tree_int.
(build_base_field): Add casts of TREE_INT_CST_LOW to HOST_WIDE_INT.
* cp/error.c (dump_expr): Cast TREE_INT_CST_HIGH to unsigned.
* cp/init.c (build_vec_init): Cast TREE_INT_CST_LOW to HOST_WIDE_INT.
* cp/method.c (build_overload_int): Cast TREE_INT_CST_HIGH to unsigned.
* cp/typeck.c (build_binary_op, case TRUNC_DIV_EXPR):
Call integer_all_onesp.
* cp/typeck2.c (process_init_constructor): Use compare_tree_int.
* f/com.c (ffecom_f2c_set_lio_code_): Use compare_tree_int.
(ffecom_sym_transform_, ffecom_transform_common_): Likewise.
(ffecom_transform_equiv_): Likewise.
* java/decl.c (emit_init_test_initialization): Mark KEY as unused.
* java/expr.c (build_newarray): Cast TREE_INT_CST_LOW to HOST_WIDE_INT.
(build_anewarray): Likewise.
* java/parse.y (patch_newarray): Likewise.
* java/parse.c: Regenerated.
From-SVN: r32383
2000-03-07 12:41:32 +01:00
|
|
|
|
|
1992-02-28 19:53:39 +01:00
|
|
|
|
return convert (integer_type_node, exp);
|
|
|
|
|
|
}
|
tree.h (INT_CST_LT, [...]): Remove unneeded casts.
* tree.h (INT_CST_LT, INT_CST_LT_UNSIGNED): Remove unneeded casts.
(struct tree_int_cst): int_cst_low is now unsigned HOST_WIDE_INT.
(attribute_hash_list, type_hash_canon): hashcode is now unsigned.
(type_hash_lookup, type_hash_add, type_hash_list): Likewise.
(min_precision): Result is unsignd.
(add_double, neg_double, mul_double): Low word is unsigned.
(lshift_double, rshift_double, lrotate_double): Likewise.
(rrotate_double, div_and_round_double): Likewise.
(tree_floor_log2, compare_tree_int): New functions.
(preserve_rtl_expr_temps): New declaration.
* c-common.c (declare_hidden_char_array): Use compare_tree_int.
(decl_attributes): Use tree_log2 to find alignment.
Check for TREE_INT_CST_HIGH for format args.
(min_precision): Now unsigned.
Use tree_floor_log2.
(truthvalue_conversion): Delete long-disabled code.
* c-decl.c (finish_struct): Clean up tests on field width.
(finish_function): Use compare_tree_int.
* c-pragma.c (handle_pragma_token): Use tree_log2 for alignment.
* c-typeck.c (comptypes): Use tree_int_cst_equal.
(default_conversion, digest_init): Use compare_tree_int.
(build_binary_op): Use integer_all_onesp and compare_tree_int.
Fix type errors in forming masks.
* calls.c (initialize_argument_information): Use compare_tree_int.
* dbxout.c (dbxout_type): Cast TREE_INT_CST_LOW to HOST_WIDE_INT.
* except.c (expand_eh_region_start_tree): Use compare_tree_int.
* expr.c (is_zeros_p, case INTEGER_CST): Use integer_zerop.
(store_field): Use compare_tree_int.
(expand_expr, case CONSTRUCTOR): Use TYPE_SIZE_UNIT.
(expand_expr, case ARRAY_REF): Use compare_tree_int.
(do_jump, case BIT_AND_EXPR): Use tree_floor_log2.
(do_store_flag): Use compare_tree_int.
* fold-const.c (encode, decode): Low part is always unsigned.
(force_fit_type, add_double, neg_double, mul_double): Likewise.
(lshift_double, rshift_double, lrotate_double): Likewise.
(rrotate_double, div_and_round_double, int_const_binop): Likewise.
(fold_convert): Use compare_tree_int.
(operand_equal_p, case INTEGER_CST): Use tree_int_cst_equal.
(invert_truthvalue, case INTEGER_CST): Likewise.
(fold): Use compare_tree_int; add casts for unsigned TREE_INT_CST_LOW.
* mkdeps.c (deps_dummy_targets): Make I unsigned.
* rtl.h (add_double, neg_double, mul_double): Low words are unsigned.
(lshift_double, rshift_double, lrotate_double, rrotate_double):
Likewise.
* stmt.c (expand_decl): Use compare_tree_int and mode_for_size_tree.
(expand_end_case): Use compare_tree_int.
(estimate_case_costs): Cast TREE_INT_CST_LOW to HOST_WIDE_INT.
* stor-layout.c (mode_for_size_tree): Use compare_tree_int.
(layout_decl): Likewise.
(layout_record, layout_union): Make sizes unsigned.
(layout_type, case VOID_TYPE): TYPE_SIZE must be bitsizetype.
(layout_type, case QUAL_UNION_TYPE): Use compare_tree_int.
* tree.c (struct type_hash): hashcode is unsigned.
(build_type_attribute_variant, type_hash_list): Likewise.
(type_hash_lookup, type_hash_add, type_hash_canon): Likewise.
(attribute_hash_list, build_array_type, build_method_type): Likewise.
(build_complex_type): Likewise.
(real_value_from_int_cst): Remove unneeded casts.
(integer_all_onesp): Add casts.
(tree_floor_log2, compare_tree_int): New functions.
(build_index_type): Use tree_int_cst_sgn.
* varasm.c (assemble_variable): Use compare_tree_int.
* ch/actions.c (chill_convert_for_assignment): INDEX is unsigned
HOST_WIDE_INT.
* ch/ch-tree.h (DECL_NESTING_LEVEL): Use TREE_INT_CST_HIGH
since unsigned.
* ch/except.c (chill_handle_on_labels): ALTERNATIVE is unsigned.
Use compare_tree_int.
(expand_goto_except_cleanup): Likewise.
* cp/class.c (dfs_modify_vtables): I is now unsigned.
(check_bitfield_decl): Use tree_int_cst_sgn and compare_tree_int.
(build_base_field): Add casts of TREE_INT_CST_LOW to HOST_WIDE_INT.
* cp/error.c (dump_expr): Cast TREE_INT_CST_HIGH to unsigned.
* cp/init.c (build_vec_init): Cast TREE_INT_CST_LOW to HOST_WIDE_INT.
* cp/method.c (build_overload_int): Cast TREE_INT_CST_HIGH to unsigned.
* cp/typeck.c (build_binary_op, case TRUNC_DIV_EXPR):
Call integer_all_onesp.
* cp/typeck2.c (process_init_constructor): Use compare_tree_int.
* f/com.c (ffecom_f2c_set_lio_code_): Use compare_tree_int.
(ffecom_sym_transform_, ffecom_transform_common_): Likewise.
(ffecom_transform_equiv_): Likewise.
* java/decl.c (emit_init_test_initialization): Mark KEY as unused.
* java/expr.c (build_newarray): Cast TREE_INT_CST_LOW to HOST_WIDE_INT.
(build_anewarray): Likewise.
* java/parse.y (patch_newarray): Likewise.
* java/parse.c: Regenerated.
From-SVN: r32383
2000-03-07 12:41:32 +01:00
|
|
|
|
|
1992-02-28 19:53:39 +01:00
|
|
|
|
if (code == VOID_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
error ("void value not ignored as it ought to be");
|
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
}
|
|
|
|
|
|
return exp;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2001-11-04 18:54:57 +01:00
|
|
|
|
/* Look up COMPONENT in a structure or union DECL.
|
|
|
|
|
|
|
|
|
|
|
|
If the component name is not found, returns NULL_TREE. Otherwise,
|
|
|
|
|
|
the return value is a TREE_LIST, with each TREE_VALUE a FIELD_DECL
|
|
|
|
|
|
stepping down the chain to the component, which is in the last
|
|
|
|
|
|
TREE_VALUE of the list. Normally the list is of length one, but if
|
|
|
|
|
|
the component is embedded within (nested) anonymous structures or
|
|
|
|
|
|
unions, the list steps down the chain to the component. */
|
2003-06-22 15:41:26 +02:00
|
|
|
|
|
1993-09-15 19:37:48 +02:00
|
|
|
|
static tree
|
2003-06-22 15:41:26 +02:00
|
|
|
|
lookup_field (tree decl, tree component)
|
1993-09-15 19:37:48 +02:00
|
|
|
|
{
|
2001-11-04 18:54:57 +01:00
|
|
|
|
tree type = TREE_TYPE (decl);
|
1993-09-15 19:37:48 +02:00
|
|
|
|
tree field;
|
|
|
|
|
|
|
|
|
|
|
|
/* If TYPE_LANG_SPECIFIC is set, then it is a sorted array of pointers
|
|
|
|
|
|
to the field elements. Use a binary search on this array to quickly
|
|
|
|
|
|
find the element. Otherwise, do a linear search. TYPE_LANG_SPECIFIC
|
|
|
|
|
|
will always be set for structures which have many elements. */
|
|
|
|
|
|
|
|
|
|
|
|
if (TYPE_LANG_SPECIFIC (type))
|
|
|
|
|
|
{
|
|
|
|
|
|
int bot, top, half;
|
2003-07-16 20:45:56 +02:00
|
|
|
|
tree *field_array = &TYPE_LANG_SPECIFIC (type)->s->elts[0];
|
1993-09-15 19:37:48 +02:00
|
|
|
|
|
|
|
|
|
|
field = TYPE_FIELDS (type);
|
|
|
|
|
|
bot = 0;
|
2003-07-16 20:45:56 +02:00
|
|
|
|
top = TYPE_LANG_SPECIFIC (type)->s->len;
|
1993-09-15 19:37:48 +02:00
|
|
|
|
while (top - bot > 1)
|
|
|
|
|
|
{
|
|
|
|
|
|
half = (top - bot + 1) >> 1;
|
|
|
|
|
|
field = field_array[bot+half];
|
|
|
|
|
|
|
|
|
|
|
|
if (DECL_NAME (field) == NULL_TREE)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Step through all anon unions in linear fashion. */
|
|
|
|
|
|
while (DECL_NAME (field_array[bot]) == NULL_TREE)
|
|
|
|
|
|
{
|
|
|
|
|
|
field = field_array[bot++];
|
1997-04-13 16:59:54 +02:00
|
|
|
|
if (TREE_CODE (TREE_TYPE (field)) == RECORD_TYPE
|
|
|
|
|
|
|| TREE_CODE (TREE_TYPE (field)) == UNION_TYPE)
|
1993-10-07 00:32:11 +01:00
|
|
|
|
{
|
2001-11-04 18:54:57 +01:00
|
|
|
|
tree anon = lookup_field (field, component);
|
|
|
|
|
|
|
|
|
|
|
|
if (anon)
|
|
|
|
|
|
return tree_cons (NULL_TREE, field, anon);
|
2003-06-22 15:41:26 +02:00
|
|
|
|
}
|
1993-09-15 19:37:48 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Entire record is only anon unions. */
|
|
|
|
|
|
if (bot > top)
|
|
|
|
|
|
return NULL_TREE;
|
|
|
|
|
|
|
|
|
|
|
|
/* Restart the binary search, with new lower bound. */
|
|
|
|
|
|
continue;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
1995-07-15 01:23:27 +02:00
|
|
|
|
if (DECL_NAME (field) == component)
|
1993-09-15 19:37:48 +02:00
|
|
|
|
break;
|
1995-07-15 01:23:27 +02:00
|
|
|
|
if (DECL_NAME (field) < component)
|
1993-09-15 19:37:48 +02:00
|
|
|
|
bot += half;
|
|
|
|
|
|
else
|
|
|
|
|
|
top = bot + half;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (DECL_NAME (field_array[bot]) == component)
|
|
|
|
|
|
field = field_array[bot];
|
|
|
|
|
|
else if (DECL_NAME (field) != component)
|
2001-11-04 18:54:57 +01:00
|
|
|
|
return NULL_TREE;
|
1993-09-15 19:37:48 +02:00
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
for (field = TYPE_FIELDS (type); field; field = TREE_CHAIN (field))
|
|
|
|
|
|
{
|
2001-11-04 18:54:57 +01:00
|
|
|
|
if (DECL_NAME (field) == NULL_TREE
|
|
|
|
|
|
&& (TREE_CODE (TREE_TYPE (field)) == RECORD_TYPE
|
|
|
|
|
|
|| TREE_CODE (TREE_TYPE (field)) == UNION_TYPE))
|
1993-09-15 19:37:48 +02:00
|
|
|
|
{
|
2001-11-04 18:54:57 +01:00
|
|
|
|
tree anon = lookup_field (field, component);
|
1997-04-13 16:59:54 +02:00
|
|
|
|
|
2001-11-04 18:54:57 +01:00
|
|
|
|
if (anon)
|
|
|
|
|
|
return tree_cons (NULL_TREE, field, anon);
|
1993-09-15 19:37:48 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (DECL_NAME (field) == component)
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
2001-11-04 18:54:57 +01:00
|
|
|
|
|
|
|
|
|
|
if (field == NULL_TREE)
|
|
|
|
|
|
return NULL_TREE;
|
1993-09-15 19:37:48 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
2001-11-04 18:54:57 +01:00
|
|
|
|
return tree_cons (NULL_TREE, field, NULL_TREE);
|
1993-09-15 19:37:48 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
1992-02-28 19:53:39 +01:00
|
|
|
|
/* Make an expression to refer to the COMPONENT field of
|
|
|
|
|
|
structure or union value DATUM. COMPONENT is an IDENTIFIER_NODE. */
|
|
|
|
|
|
|
|
|
|
|
|
tree
|
2003-06-22 15:41:26 +02:00
|
|
|
|
build_component_ref (tree datum, tree component)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2001-10-11 05:16:15 +02:00
|
|
|
|
tree type = TREE_TYPE (datum);
|
|
|
|
|
|
enum tree_code code = TREE_CODE (type);
|
|
|
|
|
|
tree field = NULL;
|
|
|
|
|
|
tree ref;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2004-06-01 17:12:23 +02:00
|
|
|
|
if (!objc_is_public (datum, component))
|
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
|
re PR c/461 (non-lvalue arrays)
* c-common.c (c_expand_expr_stmt): Apply default conversions to
non-lvalue arrays if C99.
* c-typeck.c (default_conversion): Split out code handling
array-to-pointer and function-to-pointer conversions into a
separate default_function_array_conversion function.
(default_function_array_conversion): New function. Keep track of
whether any NON_LVALUE_EXPRs were stripped. Return non-lvalue
arrays unchanged outside C99 mode instead of giving an error for
them.
(build_component_ref): Use pedantic_non_lvalue when handling
COMPOUND_EXPR. Don't handle COND_EXPR specially.
(convert_arguments): Use default_function_array_conversion.
(build_unary_op): For ADDR_EXPR, take a flag indicating whether
non-lvalues are OK.
(unary_complex_lvalue): Likewise.
(internal_build_compound_expr): Use
default_function_array_conversion. Apply default conversions to
function in compound expression.
(build_c_cast, build_modify_expr, digest_init, build_asm_stmt):
Use default_function_array_conversion.
* doc/extend.texi: Update documentation of subscripting non-lvalue
arrays.
Fixes PR c/461.
testsuite:
* gcc.dg/c90-array-lval-1.c, gcc.dg/c90-array-lval-2.c,
gcc.dg/c99-array-lval-1.c, gcc.dg/c99-array-lval-2.c: Remove
XFAILs. Adjust expected error texts.
* gcc.c-torture/compile/20011106-1.c,
gcc.c-torture/compile/20011106-2.c, gcc.dg/c90-array-lval-3.c,
gcc.dg/c90-array-lval-4.c, gcc.dg/c90-array-lval-5.c,
gcc.dg/c99-array-lval-3.c, gcc.dg/c99-array-lval-4.c,
gcc.dg/c99-array-lval-5.c: New tests.
From-SVN: r46805
2001-11-06 13:39:36 +01:00
|
|
|
|
/* If DATUM is a COMPOUND_EXPR, move our reference inside it.
|
2004-01-20 02:38:27 +01:00
|
|
|
|
Ensure that the arguments are not lvalues; otherwise,
|
re PR c/461 (non-lvalue arrays)
* c-common.c (c_expand_expr_stmt): Apply default conversions to
non-lvalue arrays if C99.
* c-typeck.c (default_conversion): Split out code handling
array-to-pointer and function-to-pointer conversions into a
separate default_function_array_conversion function.
(default_function_array_conversion): New function. Keep track of
whether any NON_LVALUE_EXPRs were stripped. Return non-lvalue
arrays unchanged outside C99 mode instead of giving an error for
them.
(build_component_ref): Use pedantic_non_lvalue when handling
COMPOUND_EXPR. Don't handle COND_EXPR specially.
(convert_arguments): Use default_function_array_conversion.
(build_unary_op): For ADDR_EXPR, take a flag indicating whether
non-lvalues are OK.
(unary_complex_lvalue): Likewise.
(internal_build_compound_expr): Use
default_function_array_conversion. Apply default conversions to
function in compound expression.
(build_c_cast, build_modify_expr, digest_init, build_asm_stmt):
Use default_function_array_conversion.
* doc/extend.texi: Update documentation of subscripting non-lvalue
arrays.
Fixes PR c/461.
testsuite:
* gcc.dg/c90-array-lval-1.c, gcc.dg/c90-array-lval-2.c,
gcc.dg/c99-array-lval-1.c, gcc.dg/c99-array-lval-2.c: Remove
XFAILs. Adjust expected error texts.
* gcc.c-torture/compile/20011106-1.c,
gcc.c-torture/compile/20011106-2.c, gcc.dg/c90-array-lval-3.c,
gcc.dg/c90-array-lval-4.c, gcc.dg/c90-array-lval-5.c,
gcc.dg/c99-array-lval-3.c, gcc.dg/c99-array-lval-4.c,
gcc.dg/c99-array-lval-5.c: New tests.
From-SVN: r46805
2001-11-06 13:39:36 +01:00
|
|
|
|
if the component is an array, it would wrongly decay to a pointer in
|
|
|
|
|
|
C89 mode.
|
|
|
|
|
|
We cannot do this with a COND_EXPR, because in a conditional expression
|
|
|
|
|
|
the default promotions are applied to both sides, and this would yield
|
|
|
|
|
|
the wrong type of the result; for example, if the components have
|
|
|
|
|
|
type "char". */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
switch (TREE_CODE (datum))
|
|
|
|
|
|
{
|
|
|
|
|
|
case COMPOUND_EXPR:
|
|
|
|
|
|
{
|
|
|
|
|
|
tree value = build_component_ref (TREE_OPERAND (datum, 1), component);
|
|
|
|
|
|
return build (COMPOUND_EXPR, TREE_TYPE (value),
|
2004-01-20 02:38:27 +01:00
|
|
|
|
TREE_OPERAND (datum, 0), non_lvalue (value));
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
1997-11-02 22:19:36 +01:00
|
|
|
|
default:
|
|
|
|
|
|
break;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* See if there is a field or component with name COMPONENT. */
|
|
|
|
|
|
|
|
|
|
|
|
if (code == RECORD_TYPE || code == UNION_TYPE)
|
|
|
|
|
|
{
|
tree.h (COMPLETE_TYPE_P): New macro.
gcc
* tree.h (COMPLETE_TYPE_P): New macro.
(COMPLETE_OR_VOID_TYPE_P): New macro.
(COMPLETE_OR_UNBOUND_ARRAY_TYPE_P): New macro.
* stor-layout.c (layout_type, case VOID_TYPE): Don't set TYPE_SIZE.
* c-aux-info.c (gen_type): Use them.
* c-common.c (c_expand_expr_stmt): Likewise.
* c-decl.c (poplevel, pushdecl, start_decl, finish_decl,
grokdeclarator, grokparms, finish_struct, start_function,
store_parm_decls, combine_parm_decls): Likewise.
* c-parse.y (cast_expr): Likewise.
* c-typeck.c (require_complete_type, c_sizeof, c_sizeof_nowarn,
c_size_in_bytes, c_alignof, build_component_ref,
build_indirect_ref, build_array_ref, convert_arguments,
build_binary_op, pointer_diff, build_unary_op, digest_init: Likewise.
* calls.c (initialize_argument_information): Likewise.
* convert.c (convert_to_integer): Likewise.
* dbxout.c (dbxout_typedefs, dbxout_type, dbxout_symbol): Likewise.
* dwarfout.c (location_or_const_value_attribute,
output_enumeration_type_die, output_structure_type_die,
output_union_type_die, output_type): Likewise.
* expr.c (safe_from_p, expand_expr): Likewise.
* function.c (assign_parms): Likewise.
* sdbout.c (sdbout_symbol, sdbout_one_type): Likewise.
* tree.c (build_array_type, build_function_type,
build_method_type, build_offset_type, build_complex_type): Likewise.
* c-parse.c, c-parse.h: Regenerated.
gcc/cp
* typeck.c (require_complete_type, complete_type,
complete_type_or_else, c_sizeof, c_sizeof_nowarn,
build_array_ref, convert_arguments, pointer_diff,
build_x_unary_op, build_unary_op, build_c_cast,
build_modify_expr): Use COMPLETE_TYPE_P etc.
* call.c (is_complete, convert_like_real,
build_new_method_call): Likewise.
* class.c (build_vbase_pointer_fields, check_bases,
build_base_field, finish_struct_1, pushclass): Likewise.
* cvt.c (cp_convert_to_pointer, convert_to_void): Likewise.
* decl.c (maybe_process_template_type_declaration, pushtag,
pushdecl, redeclaration_error_message, start_decl, start_decl_1,
layout_var_decl, check_initializer, cp_finish_decl,
grokdeclarator, require_complete_types_for_parms,
grok_op_properties, xref_tag, xref_basetypes,
check_function_type): Likewise.
* decl2.c (check_classfn, reparse_absdcl_as_casts): Likewise.
* friend.c (do_friend): Likewise.
* init.c (build_offset_ref): Likewise.
* parse.y (structsp): Likewise.
* pt.c (maybe_process_partial_specialization,
tsubst_friend_function, instantiate_class_template, tsubst,
do_type_instantiation, instantiate_pending_templates): Likewise.
* repo.c (repo_get_id): Likewise.
* rtti.c (build_typeid, get_typeid, build_dynamic_cast_1,
synthesize_tinfo_var, emit_support_tinfos): Likewise.
* search.c (lookup_fnfields_1, lookup_conversions): Likewise.
* semantics.c (begin_class_definition): Likewise.
* tree.c (build_cplus_method_type): Likewise.
* typeck2.c (digest_init, build_functional_cast,
add_exception_specifier): Likewise.
* parse.h, parse.c: Regenerated.
From-SVN: r32671
2000-03-21 19:10:48 +01:00
|
|
|
|
if (!COMPLETE_TYPE_P (type))
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2002-04-18 19:54:11 +02:00
|
|
|
|
c_incomplete_type_error (NULL_TREE, type);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2001-11-04 18:54:57 +01:00
|
|
|
|
field = lookup_field (datum, component);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
|
|
|
|
|
if (!field)
|
|
|
|
|
|
{
|
c-common.c (check_format_info): Don't call a variadic function with a non-literal format string.
* c-common.c (check_format_info): Don't call a variadic function
with a non-literal format string.
* c-decl.c (grokdeclarator, start_struct, finish_struct): Likewise.
* c-typeck.c (build_component_ref, build_unary_op, lvalue_or_else,
pedantic_lvalue_warning, error_init, pedwarn_init, warning_init):
Likewise.
* cccp.c (check_macro_name, do_xifdef, vwarning_with_line):
Likewise.
* collect2.c (collect_wait): Likewise.
* dbxout.c (dbxout_type): Likewise.
* gcc.c (do_spec_1): Likewise.
* genemit.c (gen_insn, gen_expand): Likewise.
* genrecog.c (write_switch, write_subroutine): Likewise.
* mips-tfile.c (catch_signal, botch): Likewise.
* print-rtl.c (print_rtx): Likewise.
* toplev.c (default_print_error_function, report_error_function,
_fatal_insn): Likewise.
From-SVN: r30666
1999-11-25 17:58:32 +01:00
|
|
|
|
error ("%s has no member named `%s'",
|
|
|
|
|
|
code == RECORD_TYPE ? "structure" : "union",
|
1992-02-28 19:53:39 +01:00
|
|
|
|
IDENTIFIER_POINTER (component));
|
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2001-11-04 18:54:57 +01:00
|
|
|
|
/* Chain the COMPONENT_REFs if necessary down to the FIELD.
|
|
|
|
|
|
This might be better solved in future the way the C++ front
|
|
|
|
|
|
end does it - by giving the anonymous entities each a
|
|
|
|
|
|
separate name and type, and then have build_component_ref
|
|
|
|
|
|
recursively call itself. We can't do that here. */
|
2003-03-16 14:54:23 +01:00
|
|
|
|
do
|
1993-10-07 00:32:11 +01:00
|
|
|
|
{
|
2001-11-04 18:54:57 +01:00
|
|
|
|
tree subdatum = TREE_VALUE (field);
|
|
|
|
|
|
|
|
|
|
|
|
if (TREE_TYPE (subdatum) == error_mark_node)
|
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
|
alias.c (adjust_offset_for_component_ref): Use component_ref_field_offset.
* alias.c (adjust_offset_for_component_ref): Use
component_ref_field_offset.
* c-decl.c (build_array_declarator): Add news args for ARRAY_REF.
* c-gimplify.c (gimplify_expr_stmt): Use alloc_stmt_list.
(gimplify_decl_stmt): Call gimplify_type_sizes for type.
For decl, call gimplify_one_sizepos and use statement list.
(gimplify_compound_literal_expr): New arg PRE_P.
Add statement to PRE_P list and return DECL.
(c_gimplify_expr, case COMPOUND_LITERAL_EXPR): Add arg to
gimplify_compound_literal_expr.
* c-tree.h (getdecls): Deleted.
* c-typeck.c (build_component_ref): Add operand for COMPONENT_REF.
(build_array_ref): Add two operands for ARRAY_REF.
(build_unary_op): Set TREE_INVARIANT and TREE_CONSTANT for
COMPOUND_LITERAL_EXPR.
* coverage.c (tree_coverage_counter_ref): Add new operands
for ARRAY_REF.
* emit-rtl.c (component_ref_for_mem_expr): Add new operand
for COMPONENT_REF.
(set_mem_attributes_minus_bitpos): Use array_ref_low_bound
and array_ref_element_size.
(widen_memory_access):Use component_ref_field_offset.
* explow.c (update_nonlocal_goto_save_area): Add two operands
for ARRAY_REF.
* expr.c (array_ref_element_size, array_ref_low_bound): New functions.
(component_ref_field_offset): Likewise.
(get_inner_reference): Use them.
(expand_expr_real_1, case ARRAY_REF): Use array_ref_low_bound.
* fold-const.c (fold, case EQ_EXPR): Properly handle DECL_SIZE.
(fold_read_from_constant_string): Use array_ref_low_bound.
Verify that result is a character type.
(build_fold_indirect_ref): Add two operands for ARRAY_REF.
* function.c (expand_function_start): Likewise.
* gimple-low.c (expand_var_p): Delete duplicated line.
* gimplify.c: Add static decls for local functions.
(cgraph.h): Now included.
(create_tmp_var): Remove check for ARRAY_TYPE.
(copy_if_shared_r): Look at bounds and sizes of types.
(build_and_jump): Return alloc_stmt_list instead of build_empty_stmt.
(gimplify_exit_expr, shortcut_cond_expr): Likewise.
(gimplify_save_expr, gimple_push_cleanup): Likewise.
(gimplify_init_constructor): Likewise.
WANT_VALUE now bool.
If empty list with no result wanted, return GS_UNHANDLED.
Add additional operands for ARRAY_REF and COMPONENT_REF.
(canonicalize_component_ref): Convert to &array[L].
(gimplify_array_ref_to_plus): Use array_ref_element_size and
array_ref_lower_bound.
(build_addr_expr_with_type, build_addr_expr): New functions.
(gimplify_compound_lval): WANT_LVALUE now bool.
Major rework to allow handle_component_p and initialize and
gimplify new operands for ARRAY_REF, ARRAY_RANGE_REF, and
COMPONENT_REF.
(gimplify_array_ref): Deleted.
(gimplify_self_mod_expr): WANT_VALUE now bool.
(gimplify_modify_expr): Gimplify to_p and from_p later.
Factor out code into gimplify_modify_expr_rhs and call twice.
Move variable-size code earlier and handle PLACEHOLDER_EXPR.
(gimplify_modify_expr_rhs, gimplify_variable_sized_compare): New fns.
(gimplify_addr_expr, case VIEW_CONVERT_EXPR): New case.
(gimplify_expr, case ARRAY_REF): Delete special case.
Instead handle like COMPONENT_REF; also do ARRAY_RANGE_REF,
IMAGPART, and REALPART the same way.
(gimplify_expr, case VIEW_CONVERT_EXPR): New case.
(gimplify_expr): Call gimplify_variable_sized_compare if applicable.
Call alloc_stmt_list instead of build_empty_stmt.
Deal with _REF that's volatile.
(gimplify_type_sizes, gimplify_one_sizepos): New functions.
(unshare_body, unvisit_body): New functions.
(gimplify_body): Call them.
* stmt.c (expand_stack_alloc): Don't expand TYPE_MAX_VALUE.
* stor-layout.c (get_pending_sizes): Don't change SAVE_EXPR_CONTEXT.
* tree-alias-common.c (get_alias_var): Also skip ARRAY_RANGE_REF.
* tree-cfg.c (tree_node_can_be_shared): Treat ARRAY_RANGE_REF
like ARRAY_REF.
(verify_expr, case ADDR_EXPR): Use handled_component_p.
* tree-dfa.c (get_virtual_var): Likewise.
* tree-dump.c (dequeue_and_dump, case COMPONENT_REF, ARRAY_REF):
New cases to dump new operands; likewise for ARRAY_RANGE_REF.
* tree-eh.c (tree_could_trap, case ARRAY_RANGE_REF): Like ARRAY_REF.
* tree-gimple.c (is_gimple_addr_expr_arg): Add ARRAY_RANGE_REF
and INDIRECT_REF.
(get_base_address): Use handled_component_p.
* tree-gimple.h (gimplify_type_sizes, gimplify_one_sizepos): New.
* tree-line.c (walk_tree): Walk more things for types and decls.
* tree-mudflap.c (mf_build_check_statement_for): Add new operands
for ARRAY_REF and COMPONENT_REF.
(mx_xform_derefs_1): Clean up usage of decl sizes.
* tree-nested.c (build_addr): Use handled_component_p.
(walk_stmts, case CATCH_EXPR): Add missing "break".
(get_static_chain, get_frame_field): Add new operand for COMPONENT_REF.
(finalize_nesting_tree_1): Likewise.
(convert_nonlocal_reference, case ARRAY_RANGE_REF): Like ARRAY_REF
and process additional operands.
(convert_local_reference): Likewise.
* tree-outof-ssa.c (discover_nonconstant_array_refs_r): Treat
ARRAY_RANGE_REF similarly to ARRAY_REF.
* tree-pretty-print.c (dump_generic_node, case QUAL_UNION_TYPE): Handle
like RECORD_TYPE.
(dump_generic_node, case COMPONENT_REF): Print offset operand.
(dump_generic_node, case ARRAY_RANGE_REF): Treat like ARRAY_REF
and print lower bound and element size for both.
(op_prio, case ARRAY_RANGE_REF): Like ARRAY_REF.
* tree-sra.c (csc_build_component_ref): Add new operand.
(scalarize_call_expr): Use get_base_address.
* tree-ssa-ccp.c (widen_bitfield): Clean up size handling.
(maybe_fold_offset_to_array_ref): Rework to handle input having an
ARRAY_REF, refine handling of lower bound, and add new operands
for ARRAY_REF.
(maybe_fold_to_component_ref): Add new operand for COMPONENT_REF.
(maybe_fold_stmt_indirect): Only fold *&B to B if types match.
(maybe_fold_stmt_addition): Only handle constant lower bound.
* tree-ssa-operands.c (get_expr_operands): Minor rearrangements.
Treat ARRAY_REF and ARRAY_RANGE_REF the same; look at extra operands.
Look at new offset operand of COMPONENT_REF.
* tree-ssa.c (set_is_used): Use handled_component_p.
* tree.c (substitute_in_expr, case COMPONENT_REF): Add new operand.
(stabilize_reference, case COMPONENT_REF): Likewise.
(stabilize_reference, case ARRAY_RANGE_REF, ARRAY_REF): Similarly.
(recompute_tree_invariant_for_addr_expr): Completely rework to
be more precise. Also set TREE_SIDE_EFFECTS.
(build1_stat, case ARRAY_EXPR): Don't handle TREE_SIDE_EFFECTS here.
(build2_stat, build3_stat, build4_stat): For references,
propagate TREE_THIS_VOLATILE.
(get_unwidened): Add new operand for COMPONENT_REF.
(get_narrower): Likewise; use host_integerp for DECL_SIZE.
* tree.def (COMPONENT_REF): Add new operand.
(ARRAY_REF, ARRAY_RANGE_REF): Add two new operands.
* tree.h (array_ref_element_size, array_ref_low_bound): New decls.
(component_ref_field_offset): Likewise.
* config/alpha/alpha.c (alpha_va_start): Add new op for COMPONENT_REF.
(alpha_gimplify_va_arg): Likewise.
* config/i386/i386.c (ix86_va_start, ix86_gimplify_va_arg): Likewise.
* config/i860/i860.c (i860_va_start, i860_va_arg): Likewise.
* config/iq2000/iq2000.c (iq2000_va_arg): Likewise.
* config/mips/mips.c (mips_va_start, mips_va_arg): Likewise.
* config/rs6000/rs6000.c (rs6000_va_start, rs6000_gimplify_va_arg):
Likewise.
* config/s390/s390.c (s390_va_start, s390_gimplify_va_arg): Likewise.
* config/sh/sh.c (sh_va_start, sh_va_arg): Likewise.
* config/stormy16/stormy16.c (xstormy1_expand_builin_va_start):
Likewise.
(xstormy16_expand_builtin_va_arg): Likewise.
* config/xtensa/xtensa.c (xtensa_va_start, xtensa_va_arg): Likewise.
* cp/call.c (build_vfield_ref): Add new operand for COMPONENT_REF.
(build_new_method_call): Likewise.
* cp/decl.c (local_variable_p_walkfn): Don't walk into types.
* cp/decl2.c (grok_array_decl): Add new operands for ARRAY_REF.
(build_anon_union_vars): Add new operand for COMPONENT_REF.
* cp/init.c (buld_new): Add new operand for ARRAY_REF.
* cp/method.c (do_build_copy_constructor): New op for COMPONENT_REF.
(do_build_assign_ref): Likewise.
* cp/parser.c (cp_parser_direct_new_declarator): Add new operands
for ARRAY_REF.
(cp_parser_direct_declarator): Likewise.
* cp/pt.c (tsubst): Likewise.
(tsubst_copy, tsubst_copy_and_build): Likewise; also add new operand
for COMPONENT_REF.
* cp/semantics.c (finish_non_static_data_member): Add new operand
for COMPONENT_REF.
* cp/typeck.c (build_class_member_access_expr): Likewise.
(build_class_member_access_expr, finish_class_member_access_expr):
Likewise.
(build_ptrmemfunc_access_expr): Likewise.
(build_array_ref): Add new operands for ARRAY_REF.
* cp/typeck2.c (split_nonconstant_init_1): Likewise; COMPONENT_REF too.
* cp/tree.c (count_trees_r, no_linkage_helper): Don't walk in types.
* fortran/f95-lang.c (LANG_HOOKS_GIMPLE_BEFORE_INLINING): Deleted.
* fortran/trans-array.c (gfc_conv_descriptor_data): Add operand
for COMPONENT_REF.
(gfc_conv_descriptor_offset, gfc_conv_descriptor_dtype): Likewise.
(gfc_conv_descriptor_dimension, gfc_conv_descriptor_stride): Likewise.
(gfc_conv_descriptor_lbound, gfc_conv_descriptor_ubound): Likewise.
* fortran/trans-common.c (create_common): Likewise.
* fortran/trans-expr.c (gfc_conv_component_ref): Likewise.
* fortran/trans-io.c (set_parameter_value): Likewise.
(set_parameter_ref, set_string, set_flag, io_result): Likewise.
(transfer_expr): Likewise.
* fortran/trans-decl.c (gfc_trans_auto_character_variable):
Set up to get DECL_SIZE and DECL_SIZE_UNIT gimplified.
(gfc_simplify_function): New function.
(gfc_generate_function-code): Properly handle nested functions.
* fortran/trans.c (gfc_build_array_ref): Add two new operands
for ARRAY_REF.
* java/class.c (build_class_ref): Add new operand for COMPONENT_REF.
(build_static_field_ref): Likewise and add new operands for ARRAY_REF.
* java/constants.c (build_ref_from_constant_pool): Likewise.
* java/expr.c (build_java_array_length_access): Likewise.
(build_get_class, build_field_ref, build_known_method_ref): Likewise.
(invoke_build_dtable, build_invokevirtual): Likewise.
(build_invokeinterface, java_expand_expr): Likewise.
(emit_init_test_initialization): Likewise.
* java/java-gimplify.c (java_gimplify_new_array_init): Likewise.
* java/parse.y (make_qualifed_name, build_array_ref): Likewise.
* objc/ojbc-act.c (generate_static_references): Add additional
operands to ARRAY_REF.
(generate_strings, build_method_prototype_list_template): Likewise.
(generate_protocol_list): Likewise.
From-SVN: r83474
2004-06-22 05:07:05 +02:00
|
|
|
|
ref = build (COMPONENT_REF, TREE_TYPE (subdatum), datum, subdatum,
|
|
|
|
|
|
NULL_TREE);
|
2001-11-04 18:54:57 +01:00
|
|
|
|
if (TREE_READONLY (datum) || TREE_READONLY (subdatum))
|
1993-10-07 00:32:11 +01:00
|
|
|
|
TREE_READONLY (ref) = 1;
|
2001-11-04 18:54:57 +01:00
|
|
|
|
if (TREE_THIS_VOLATILE (datum) || TREE_THIS_VOLATILE (subdatum))
|
1993-10-07 00:32:11 +01:00
|
|
|
|
TREE_THIS_VOLATILE (ref) = 1;
|
2002-01-10 19:51:24 +01:00
|
|
|
|
|
|
|
|
|
|
if (TREE_DEPRECATED (subdatum))
|
|
|
|
|
|
warn_deprecated_use (subdatum);
|
|
|
|
|
|
|
1993-10-07 00:32:11 +01:00
|
|
|
|
datum = ref;
|
2003-03-16 14:54:23 +01:00
|
|
|
|
|
|
|
|
|
|
field = TREE_CHAIN (field);
|
1993-10-07 00:32:11 +01:00
|
|
|
|
}
|
2003-03-16 14:54:23 +01:00
|
|
|
|
while (field);
|
1993-10-07 00:32:11 +01:00
|
|
|
|
|
1992-02-28 19:53:39 +01:00
|
|
|
|
return ref;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (code != ERROR_MARK)
|
|
|
|
|
|
error ("request for member `%s' in something not a structure or union",
|
|
|
|
|
|
IDENTIFIER_POINTER (component));
|
|
|
|
|
|
|
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Given an expression PTR for a pointer, return an expression
|
|
|
|
|
|
for the value pointed to.
|
|
|
|
|
|
ERRORSTRING is the name of the operator to appear in error messages. */
|
|
|
|
|
|
|
|
|
|
|
|
tree
|
2003-06-22 15:41:26 +02:00
|
|
|
|
build_indirect_ref (tree ptr, const char *errorstring)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2001-10-11 05:16:15 +02:00
|
|
|
|
tree pointer = default_conversion (ptr);
|
|
|
|
|
|
tree type = TREE_TYPE (pointer);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
|
|
|
|
|
if (TREE_CODE (type) == POINTER_TYPE)
|
1993-02-16 07:29:26 +01:00
|
|
|
|
{
|
|
|
|
|
|
if (TREE_CODE (pointer) == ADDR_EXPR
|
|
|
|
|
|
&& (TREE_TYPE (TREE_OPERAND (pointer, 0))
|
|
|
|
|
|
== TREE_TYPE (type)))
|
|
|
|
|
|
return TREE_OPERAND (pointer, 0);
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
tree t = TREE_TYPE (type);
|
2001-10-11 05:16:15 +02:00
|
|
|
|
tree ref = build1 (INDIRECT_REF, TYPE_MAIN_VARIANT (t), pointer);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2000-07-02 21:19:18 +02:00
|
|
|
|
if (!COMPLETE_OR_VOID_TYPE_P (t) && TREE_CODE (t) != ARRAY_TYPE)
|
1993-02-16 07:29:26 +01:00
|
|
|
|
{
|
|
|
|
|
|
error ("dereferencing pointer to incomplete type");
|
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
}
|
2000-07-02 21:19:18 +02:00
|
|
|
|
if (VOID_TYPE_P (t) && skip_evaluation == 0)
|
1993-02-16 07:29:26 +01:00
|
|
|
|
warning ("dereferencing `void *' pointer");
|
|
|
|
|
|
|
|
|
|
|
|
/* We *must* set TREE_READONLY when dereferencing a pointer to const,
|
|
|
|
|
|
so that we get the proper error message if the result is used
|
|
|
|
|
|
to assign to. Also, &* is supposed to be a no-op.
|
|
|
|
|
|
And ANSI C seems to specify that the type of the result
|
|
|
|
|
|
should be the const type. */
|
|
|
|
|
|
/* A de-reference of a pointer to const is not a const. It is valid
|
|
|
|
|
|
to change it via some other pointer. */
|
|
|
|
|
|
TREE_READONLY (ref) = TYPE_READONLY (t);
|
|
|
|
|
|
TREE_SIDE_EFFECTS (ref)
|
2003-02-01 14:09:41 +01:00
|
|
|
|
= TYPE_VOLATILE (t) || TREE_SIDE_EFFECTS (pointer);
|
1993-09-20 23:23:53 +02:00
|
|
|
|
TREE_THIS_VOLATILE (ref) = TYPE_VOLATILE (t);
|
1993-02-16 07:29:26 +01:00
|
|
|
|
return ref;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
else if (TREE_CODE (pointer) != ERROR_MARK)
|
|
|
|
|
|
error ("invalid type argument of `%s'", errorstring);
|
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* This handles expressions of the form "a[i]", which denotes
|
|
|
|
|
|
an array reference.
|
|
|
|
|
|
|
|
|
|
|
|
This is logically equivalent in C to *(a+i), but we may do it differently.
|
|
|
|
|
|
If A is a variable or a member, we generate a primitive ARRAY_REF.
|
|
|
|
|
|
This avoids forcing the array out of registers, and can work on
|
|
|
|
|
|
arrays that are not lvalues (for example, members of structures returned
|
|
|
|
|
|
by functions). */
|
|
|
|
|
|
|
|
|
|
|
|
tree
|
2003-06-22 15:41:26 +02:00
|
|
|
|
build_array_ref (tree array, tree index)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
|
|
|
|
|
if (index == 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
error ("subscript missing in array reference");
|
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (TREE_TYPE (array) == error_mark_node
|
|
|
|
|
|
|| TREE_TYPE (index) == error_mark_node)
|
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
|
2004-05-13 08:41:07 +02:00
|
|
|
|
if (TREE_CODE (TREE_TYPE (array)) == ARRAY_TYPE)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
|
|
|
|
|
tree rval, type;
|
|
|
|
|
|
|
|
|
|
|
|
/* Subscripting with type char is likely to lose
|
|
|
|
|
|
on a machine where chars are signed.
|
|
|
|
|
|
So warn on any machine, but optionally.
|
|
|
|
|
|
Don't warn for unsigned char since that type is safe.
|
|
|
|
|
|
Don't warn for signed char because anyone who uses that
|
|
|
|
|
|
must have done so deliberately. */
|
|
|
|
|
|
if (warn_char_subscripts
|
|
|
|
|
|
&& TYPE_MAIN_VARIANT (TREE_TYPE (index)) == char_type_node)
|
|
|
|
|
|
warning ("array subscript has type `char'");
|
|
|
|
|
|
|
1992-05-04 05:04:19 +02:00
|
|
|
|
/* Apply default promotions *after* noticing character types. */
|
|
|
|
|
|
index = default_conversion (index);
|
|
|
|
|
|
|
1992-05-05 18:04:53 +02:00
|
|
|
|
/* Require integer *after* promotion, for sake of enums. */
|
|
|
|
|
|
if (TREE_CODE (TREE_TYPE (index)) != INTEGER_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
error ("array subscript is not an integer");
|
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
1992-02-28 19:53:39 +01:00
|
|
|
|
/* An array that is indexed by a non-constant
|
|
|
|
|
|
cannot be stored in a register; we must be able to do
|
|
|
|
|
|
address arithmetic on its address.
|
|
|
|
|
|
Likewise an array of elements of variable size. */
|
|
|
|
|
|
if (TREE_CODE (index) != INTEGER_CST
|
tree.h (COMPLETE_TYPE_P): New macro.
gcc
* tree.h (COMPLETE_TYPE_P): New macro.
(COMPLETE_OR_VOID_TYPE_P): New macro.
(COMPLETE_OR_UNBOUND_ARRAY_TYPE_P): New macro.
* stor-layout.c (layout_type, case VOID_TYPE): Don't set TYPE_SIZE.
* c-aux-info.c (gen_type): Use them.
* c-common.c (c_expand_expr_stmt): Likewise.
* c-decl.c (poplevel, pushdecl, start_decl, finish_decl,
grokdeclarator, grokparms, finish_struct, start_function,
store_parm_decls, combine_parm_decls): Likewise.
* c-parse.y (cast_expr): Likewise.
* c-typeck.c (require_complete_type, c_sizeof, c_sizeof_nowarn,
c_size_in_bytes, c_alignof, build_component_ref,
build_indirect_ref, build_array_ref, convert_arguments,
build_binary_op, pointer_diff, build_unary_op, digest_init: Likewise.
* calls.c (initialize_argument_information): Likewise.
* convert.c (convert_to_integer): Likewise.
* dbxout.c (dbxout_typedefs, dbxout_type, dbxout_symbol): Likewise.
* dwarfout.c (location_or_const_value_attribute,
output_enumeration_type_die, output_structure_type_die,
output_union_type_die, output_type): Likewise.
* expr.c (safe_from_p, expand_expr): Likewise.
* function.c (assign_parms): Likewise.
* sdbout.c (sdbout_symbol, sdbout_one_type): Likewise.
* tree.c (build_array_type, build_function_type,
build_method_type, build_offset_type, build_complex_type): Likewise.
* c-parse.c, c-parse.h: Regenerated.
gcc/cp
* typeck.c (require_complete_type, complete_type,
complete_type_or_else, c_sizeof, c_sizeof_nowarn,
build_array_ref, convert_arguments, pointer_diff,
build_x_unary_op, build_unary_op, build_c_cast,
build_modify_expr): Use COMPLETE_TYPE_P etc.
* call.c (is_complete, convert_like_real,
build_new_method_call): Likewise.
* class.c (build_vbase_pointer_fields, check_bases,
build_base_field, finish_struct_1, pushclass): Likewise.
* cvt.c (cp_convert_to_pointer, convert_to_void): Likewise.
* decl.c (maybe_process_template_type_declaration, pushtag,
pushdecl, redeclaration_error_message, start_decl, start_decl_1,
layout_var_decl, check_initializer, cp_finish_decl,
grokdeclarator, require_complete_types_for_parms,
grok_op_properties, xref_tag, xref_basetypes,
check_function_type): Likewise.
* decl2.c (check_classfn, reparse_absdcl_as_casts): Likewise.
* friend.c (do_friend): Likewise.
* init.c (build_offset_ref): Likewise.
* parse.y (structsp): Likewise.
* pt.c (maybe_process_partial_specialization,
tsubst_friend_function, instantiate_class_template, tsubst,
do_type_instantiation, instantiate_pending_templates): Likewise.
* repo.c (repo_get_id): Likewise.
* rtti.c (build_typeid, get_typeid, build_dynamic_cast_1,
synthesize_tinfo_var, emit_support_tinfos): Likewise.
* search.c (lookup_fnfields_1, lookup_conversions): Likewise.
* semantics.c (begin_class_definition): Likewise.
* tree.c (build_cplus_method_type): Likewise.
* typeck2.c (digest_init, build_functional_cast,
add_exception_specifier): Likewise.
* parse.h, parse.c: Regenerated.
From-SVN: r32671
2000-03-21 19:10:48 +01:00
|
|
|
|
|| (COMPLETE_TYPE_P (TREE_TYPE (TREE_TYPE (array)))
|
1992-02-28 19:53:39 +01:00
|
|
|
|
&& TREE_CODE (TYPE_SIZE (TREE_TYPE (TREE_TYPE (array)))) != INTEGER_CST))
|
|
|
|
|
|
{
|
c-decl.c (grokdeclarator): Update.
* c-decl.c (grokdeclarator): Update.
* c-lang.c (LANG_HOOKS_MARK_ADDRESSABLE): Redefine.
* c-tree.h (c_mark_addressable): New.
* c-typeck.c (default_function_array_conversion, build_unary_op,
build_array_ref, convert_for_assignment): Update.
(mark_addressable): Rename.
* calls.c (try_to_integrate, expand_call): Use langhook.
* expr.c (expand_expr): Use langhook.
* langhooks-def.h (LANG_HOOKS_INITIALIZER): Update.
* langhooks.h (struct lang_hooks): New hook.
* stmt.c (expand_asm_operands): Use langhook.
* tree.h (mark_addressable): Remove.
ada:
* decl.c (gnat_to_gnu_entity): Update.
* gigi.h (mark_addressable): Rename.
* misc.c (LANG_HOOKS_MARK_ADDRESSABLE): Redefine.
* trans.c (tree_transform): Update.
* utils.c (create_var_decl): Update.
* util2.c (build_binary_op, build_unary_op,
fill_vms_descriptor): Update.
(mark_addressable): Rename, update.
cp:
* call.c (build_addr_func): Update.
* class.c (resolve_address_of_overloaded_function): Update.
* cp-lang.c (LANG_HOOKS_MARK_ADDRESSABLE): Redefine.
* cp-tree.h (cxx_mark_addressable): New.
* decl.c (register_dtor_fn, cxx_maybe_build_cleanup): Update.
* decl2.c (build_cleanup): Update.
* except.c (build_throw): Update.
* init.c (resolve_offset_ref): Update.
* pt.c (convert_nontype_argument): Update.
* semantics.c (finish_asm_stmt, simplify_affr_init_exprs_r): Update.
* typeck.c (decay_conversion, build_array_ref, build_unary_op,
unary_complex_lvalue): Update.
(mark_addressable): Rename.
f:
* com.c (LANG_HOOKS_MARK_ADDRESSABLE): Redefine.
(mark_addressable): Rename.
(ffecom_arrayref_, ffecom_1): Update.
java:
* java-tree.h (java_mark_addressable): New.
* lang.c (LANG_HOOKS_MARK_ADDRESSABLE): Redefine.
* typeck.c (mark_addressable): Rename, update.
objc:
* objc-lang.c (LANG_HOOKS_MARK_ADDRESSABLE): Redefine.
From-SVN: r51705
2002-04-01 22:26:18 +02:00
|
|
|
|
if (!c_mark_addressable (array))
|
1992-02-28 19:53:39 +01:00
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
}
|
1993-08-08 23:38:20 +02:00
|
|
|
|
/* An array that is indexed by a constant value which is not within
|
|
|
|
|
|
the array bounds cannot be stored in a register either; because we
|
|
|
|
|
|
would get a crash in store_bit_field/extract_bit_field when trying
|
|
|
|
|
|
to access a non-existent part of the register. */
|
|
|
|
|
|
if (TREE_CODE (index) == INTEGER_CST
|
tree.h (TREE_CHECK2, [...]): New macros.
* tree.h (TREE_CHECK2, TREE_CHECK3, TREE_CHECK5): New macros.
(tree_check2_failed, tree_check3_failed, tree_check5_failed): New decl.
(FUNC_OR_METHOD_CHECK, SET_ARRAY_OR_VECTOR_CHECK): New macros.
(REC_OR_UNION_CHECK, NUMERICAL_TYPE_CHECK): Likewise.
(TYPE_VALUES, TYPE_DOMAIN, TYPE_FIELDS, TYPE_METHODS, TYPE_VFIELD):
Protect with proper check.
(TYPE_ARG_TYPES, TYPE_METHOD_BASETYPE, TYPE_OFFSET_BASETYPE): Likewise.
(TYPE_MIN_VALUE, TYPE_MAX_VALUE): Likewise.
* tree.c (type_hash_eq): Rewrite to access proper fields for each type.
(tree_check2_failed, tree_check3_failed, tree_check5_failed): New.
* c-typeck.c (build_array_ref): Use TYPE_DOMAIN, not TYPE_VALUES.
* dwarf2out.c (gen_enumeration_type_die): Use TYPE_VALUES,
not TYPE_FIELDS.
* cp/class.c (finish_struct_bits): Use TYPE_VFIELD and TYPE_METHODS.
* cp/error.c (dump_type): Use TYPEOF_TYPE_EXPR.
* cp/pt.c (tsubst): Likewise.
* cp/semantics.c (finish_typeof): Likewise.
* cp/search.c (dfs_unuse_fields): Handle TYPENAME_TYPE, TYPEOF_TYPE,
and TEMPLATE_TYPE_PARM.
* cp/typeck.c (comptypes): Use TYPE_ORIG_SIZE_TYPE, not TYPE_DOMAIN.
(build_array_ref): Use TYPE_DOMAIN, not TYPE_VALUES.
* java/java-tree.h: Changes throughout to add checking to macros
and numerous whitespace changes.
(VAR_OR_FIELD_CHECK): New macro.
* java/jcf-write.c (get_access_flags): Use FIELD_PUBLIC, METHOD_PUBLIC,
FIELD_FINAL, and METHOD_FINAL instead of CLASS_PUBLIC and CLASS_FINAL.
* ada/ada-tree.h (TYPE_LEFT_JUSTIFIED_MODULAR_P): Add checking.
(TYPE_CONTAINS_TEMPLATE_P, TYPE_OBJECT_RECORD_TYPE): Likewise.
(TYPE_RM_SIZE_INT): Directly use type.values.
(TREE_LOOP_ID): Clean up check.
* ada/decl.c (gnat_to_gnu_entity, case E_Enumeration_Type): Use
TYPE_VALUES, not TYPE_FIELDS.
* ada/trans.c (convert_with_check): Delay access of bounds of basetype
until sure is numeric.
From-SVN: r79638
2004-03-18 21:58:49 +01:00
|
|
|
|
&& TYPE_DOMAIN (TREE_TYPE (array))
|
|
|
|
|
|
&& ! int_fits_type_p (index, TYPE_DOMAIN (TREE_TYPE (array))))
|
1993-08-08 23:38:20 +02:00
|
|
|
|
{
|
c-decl.c (grokdeclarator): Update.
* c-decl.c (grokdeclarator): Update.
* c-lang.c (LANG_HOOKS_MARK_ADDRESSABLE): Redefine.
* c-tree.h (c_mark_addressable): New.
* c-typeck.c (default_function_array_conversion, build_unary_op,
build_array_ref, convert_for_assignment): Update.
(mark_addressable): Rename.
* calls.c (try_to_integrate, expand_call): Use langhook.
* expr.c (expand_expr): Use langhook.
* langhooks-def.h (LANG_HOOKS_INITIALIZER): Update.
* langhooks.h (struct lang_hooks): New hook.
* stmt.c (expand_asm_operands): Use langhook.
* tree.h (mark_addressable): Remove.
ada:
* decl.c (gnat_to_gnu_entity): Update.
* gigi.h (mark_addressable): Rename.
* misc.c (LANG_HOOKS_MARK_ADDRESSABLE): Redefine.
* trans.c (tree_transform): Update.
* utils.c (create_var_decl): Update.
* util2.c (build_binary_op, build_unary_op,
fill_vms_descriptor): Update.
(mark_addressable): Rename, update.
cp:
* call.c (build_addr_func): Update.
* class.c (resolve_address_of_overloaded_function): Update.
* cp-lang.c (LANG_HOOKS_MARK_ADDRESSABLE): Redefine.
* cp-tree.h (cxx_mark_addressable): New.
* decl.c (register_dtor_fn, cxx_maybe_build_cleanup): Update.
* decl2.c (build_cleanup): Update.
* except.c (build_throw): Update.
* init.c (resolve_offset_ref): Update.
* pt.c (convert_nontype_argument): Update.
* semantics.c (finish_asm_stmt, simplify_affr_init_exprs_r): Update.
* typeck.c (decay_conversion, build_array_ref, build_unary_op,
unary_complex_lvalue): Update.
(mark_addressable): Rename.
f:
* com.c (LANG_HOOKS_MARK_ADDRESSABLE): Redefine.
(mark_addressable): Rename.
(ffecom_arrayref_, ffecom_1): Update.
java:
* java-tree.h (java_mark_addressable): New.
* lang.c (LANG_HOOKS_MARK_ADDRESSABLE): Redefine.
* typeck.c (mark_addressable): Rename, update.
objc:
* objc-lang.c (LANG_HOOKS_MARK_ADDRESSABLE): Redefine.
From-SVN: r51705
2002-04-01 22:26:18 +02:00
|
|
|
|
if (!c_mark_addressable (array))
|
1993-08-08 23:38:20 +02:00
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
|
|
|
|
|
if (pedantic)
|
|
|
|
|
|
{
|
|
|
|
|
|
tree foo = array;
|
|
|
|
|
|
while (TREE_CODE (foo) == COMPONENT_REF)
|
|
|
|
|
|
foo = TREE_OPERAND (foo, 0);
|
2004-03-28 01:31:41 +01:00
|
|
|
|
if (TREE_CODE (foo) == VAR_DECL && C_DECL_REGISTER (foo))
|
2000-08-13 23:31:09 +02:00
|
|
|
|
pedwarn ("ISO C forbids subscripting `register' array");
|
|
|
|
|
|
else if (! flag_isoc99 && ! lvalue_p (foo))
|
2002-07-21 23:35:17 +02:00
|
|
|
|
pedwarn ("ISO C90 forbids subscripting non-lvalue array");
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
type = TYPE_MAIN_VARIANT (TREE_TYPE (TREE_TYPE (array)));
|
alias.c (adjust_offset_for_component_ref): Use component_ref_field_offset.
* alias.c (adjust_offset_for_component_ref): Use
component_ref_field_offset.
* c-decl.c (build_array_declarator): Add news args for ARRAY_REF.
* c-gimplify.c (gimplify_expr_stmt): Use alloc_stmt_list.
(gimplify_decl_stmt): Call gimplify_type_sizes for type.
For decl, call gimplify_one_sizepos and use statement list.
(gimplify_compound_literal_expr): New arg PRE_P.
Add statement to PRE_P list and return DECL.
(c_gimplify_expr, case COMPOUND_LITERAL_EXPR): Add arg to
gimplify_compound_literal_expr.
* c-tree.h (getdecls): Deleted.
* c-typeck.c (build_component_ref): Add operand for COMPONENT_REF.
(build_array_ref): Add two operands for ARRAY_REF.
(build_unary_op): Set TREE_INVARIANT and TREE_CONSTANT for
COMPOUND_LITERAL_EXPR.
* coverage.c (tree_coverage_counter_ref): Add new operands
for ARRAY_REF.
* emit-rtl.c (component_ref_for_mem_expr): Add new operand
for COMPONENT_REF.
(set_mem_attributes_minus_bitpos): Use array_ref_low_bound
and array_ref_element_size.
(widen_memory_access):Use component_ref_field_offset.
* explow.c (update_nonlocal_goto_save_area): Add two operands
for ARRAY_REF.
* expr.c (array_ref_element_size, array_ref_low_bound): New functions.
(component_ref_field_offset): Likewise.
(get_inner_reference): Use them.
(expand_expr_real_1, case ARRAY_REF): Use array_ref_low_bound.
* fold-const.c (fold, case EQ_EXPR): Properly handle DECL_SIZE.
(fold_read_from_constant_string): Use array_ref_low_bound.
Verify that result is a character type.
(build_fold_indirect_ref): Add two operands for ARRAY_REF.
* function.c (expand_function_start): Likewise.
* gimple-low.c (expand_var_p): Delete duplicated line.
* gimplify.c: Add static decls for local functions.
(cgraph.h): Now included.
(create_tmp_var): Remove check for ARRAY_TYPE.
(copy_if_shared_r): Look at bounds and sizes of types.
(build_and_jump): Return alloc_stmt_list instead of build_empty_stmt.
(gimplify_exit_expr, shortcut_cond_expr): Likewise.
(gimplify_save_expr, gimple_push_cleanup): Likewise.
(gimplify_init_constructor): Likewise.
WANT_VALUE now bool.
If empty list with no result wanted, return GS_UNHANDLED.
Add additional operands for ARRAY_REF and COMPONENT_REF.
(canonicalize_component_ref): Convert to &array[L].
(gimplify_array_ref_to_plus): Use array_ref_element_size and
array_ref_lower_bound.
(build_addr_expr_with_type, build_addr_expr): New functions.
(gimplify_compound_lval): WANT_LVALUE now bool.
Major rework to allow handle_component_p and initialize and
gimplify new operands for ARRAY_REF, ARRAY_RANGE_REF, and
COMPONENT_REF.
(gimplify_array_ref): Deleted.
(gimplify_self_mod_expr): WANT_VALUE now bool.
(gimplify_modify_expr): Gimplify to_p and from_p later.
Factor out code into gimplify_modify_expr_rhs and call twice.
Move variable-size code earlier and handle PLACEHOLDER_EXPR.
(gimplify_modify_expr_rhs, gimplify_variable_sized_compare): New fns.
(gimplify_addr_expr, case VIEW_CONVERT_EXPR): New case.
(gimplify_expr, case ARRAY_REF): Delete special case.
Instead handle like COMPONENT_REF; also do ARRAY_RANGE_REF,
IMAGPART, and REALPART the same way.
(gimplify_expr, case VIEW_CONVERT_EXPR): New case.
(gimplify_expr): Call gimplify_variable_sized_compare if applicable.
Call alloc_stmt_list instead of build_empty_stmt.
Deal with _REF that's volatile.
(gimplify_type_sizes, gimplify_one_sizepos): New functions.
(unshare_body, unvisit_body): New functions.
(gimplify_body): Call them.
* stmt.c (expand_stack_alloc): Don't expand TYPE_MAX_VALUE.
* stor-layout.c (get_pending_sizes): Don't change SAVE_EXPR_CONTEXT.
* tree-alias-common.c (get_alias_var): Also skip ARRAY_RANGE_REF.
* tree-cfg.c (tree_node_can_be_shared): Treat ARRAY_RANGE_REF
like ARRAY_REF.
(verify_expr, case ADDR_EXPR): Use handled_component_p.
* tree-dfa.c (get_virtual_var): Likewise.
* tree-dump.c (dequeue_and_dump, case COMPONENT_REF, ARRAY_REF):
New cases to dump new operands; likewise for ARRAY_RANGE_REF.
* tree-eh.c (tree_could_trap, case ARRAY_RANGE_REF): Like ARRAY_REF.
* tree-gimple.c (is_gimple_addr_expr_arg): Add ARRAY_RANGE_REF
and INDIRECT_REF.
(get_base_address): Use handled_component_p.
* tree-gimple.h (gimplify_type_sizes, gimplify_one_sizepos): New.
* tree-line.c (walk_tree): Walk more things for types and decls.
* tree-mudflap.c (mf_build_check_statement_for): Add new operands
for ARRAY_REF and COMPONENT_REF.
(mx_xform_derefs_1): Clean up usage of decl sizes.
* tree-nested.c (build_addr): Use handled_component_p.
(walk_stmts, case CATCH_EXPR): Add missing "break".
(get_static_chain, get_frame_field): Add new operand for COMPONENT_REF.
(finalize_nesting_tree_1): Likewise.
(convert_nonlocal_reference, case ARRAY_RANGE_REF): Like ARRAY_REF
and process additional operands.
(convert_local_reference): Likewise.
* tree-outof-ssa.c (discover_nonconstant_array_refs_r): Treat
ARRAY_RANGE_REF similarly to ARRAY_REF.
* tree-pretty-print.c (dump_generic_node, case QUAL_UNION_TYPE): Handle
like RECORD_TYPE.
(dump_generic_node, case COMPONENT_REF): Print offset operand.
(dump_generic_node, case ARRAY_RANGE_REF): Treat like ARRAY_REF
and print lower bound and element size for both.
(op_prio, case ARRAY_RANGE_REF): Like ARRAY_REF.
* tree-sra.c (csc_build_component_ref): Add new operand.
(scalarize_call_expr): Use get_base_address.
* tree-ssa-ccp.c (widen_bitfield): Clean up size handling.
(maybe_fold_offset_to_array_ref): Rework to handle input having an
ARRAY_REF, refine handling of lower bound, and add new operands
for ARRAY_REF.
(maybe_fold_to_component_ref): Add new operand for COMPONENT_REF.
(maybe_fold_stmt_indirect): Only fold *&B to B if types match.
(maybe_fold_stmt_addition): Only handle constant lower bound.
* tree-ssa-operands.c (get_expr_operands): Minor rearrangements.
Treat ARRAY_REF and ARRAY_RANGE_REF the same; look at extra operands.
Look at new offset operand of COMPONENT_REF.
* tree-ssa.c (set_is_used): Use handled_component_p.
* tree.c (substitute_in_expr, case COMPONENT_REF): Add new operand.
(stabilize_reference, case COMPONENT_REF): Likewise.
(stabilize_reference, case ARRAY_RANGE_REF, ARRAY_REF): Similarly.
(recompute_tree_invariant_for_addr_expr): Completely rework to
be more precise. Also set TREE_SIDE_EFFECTS.
(build1_stat, case ARRAY_EXPR): Don't handle TREE_SIDE_EFFECTS here.
(build2_stat, build3_stat, build4_stat): For references,
propagate TREE_THIS_VOLATILE.
(get_unwidened): Add new operand for COMPONENT_REF.
(get_narrower): Likewise; use host_integerp for DECL_SIZE.
* tree.def (COMPONENT_REF): Add new operand.
(ARRAY_REF, ARRAY_RANGE_REF): Add two new operands.
* tree.h (array_ref_element_size, array_ref_low_bound): New decls.
(component_ref_field_offset): Likewise.
* config/alpha/alpha.c (alpha_va_start): Add new op for COMPONENT_REF.
(alpha_gimplify_va_arg): Likewise.
* config/i386/i386.c (ix86_va_start, ix86_gimplify_va_arg): Likewise.
* config/i860/i860.c (i860_va_start, i860_va_arg): Likewise.
* config/iq2000/iq2000.c (iq2000_va_arg): Likewise.
* config/mips/mips.c (mips_va_start, mips_va_arg): Likewise.
* config/rs6000/rs6000.c (rs6000_va_start, rs6000_gimplify_va_arg):
Likewise.
* config/s390/s390.c (s390_va_start, s390_gimplify_va_arg): Likewise.
* config/sh/sh.c (sh_va_start, sh_va_arg): Likewise.
* config/stormy16/stormy16.c (xstormy1_expand_builin_va_start):
Likewise.
(xstormy16_expand_builtin_va_arg): Likewise.
* config/xtensa/xtensa.c (xtensa_va_start, xtensa_va_arg): Likewise.
* cp/call.c (build_vfield_ref): Add new operand for COMPONENT_REF.
(build_new_method_call): Likewise.
* cp/decl.c (local_variable_p_walkfn): Don't walk into types.
* cp/decl2.c (grok_array_decl): Add new operands for ARRAY_REF.
(build_anon_union_vars): Add new operand for COMPONENT_REF.
* cp/init.c (buld_new): Add new operand for ARRAY_REF.
* cp/method.c (do_build_copy_constructor): New op for COMPONENT_REF.
(do_build_assign_ref): Likewise.
* cp/parser.c (cp_parser_direct_new_declarator): Add new operands
for ARRAY_REF.
(cp_parser_direct_declarator): Likewise.
* cp/pt.c (tsubst): Likewise.
(tsubst_copy, tsubst_copy_and_build): Likewise; also add new operand
for COMPONENT_REF.
* cp/semantics.c (finish_non_static_data_member): Add new operand
for COMPONENT_REF.
* cp/typeck.c (build_class_member_access_expr): Likewise.
(build_class_member_access_expr, finish_class_member_access_expr):
Likewise.
(build_ptrmemfunc_access_expr): Likewise.
(build_array_ref): Add new operands for ARRAY_REF.
* cp/typeck2.c (split_nonconstant_init_1): Likewise; COMPONENT_REF too.
* cp/tree.c (count_trees_r, no_linkage_helper): Don't walk in types.
* fortran/f95-lang.c (LANG_HOOKS_GIMPLE_BEFORE_INLINING): Deleted.
* fortran/trans-array.c (gfc_conv_descriptor_data): Add operand
for COMPONENT_REF.
(gfc_conv_descriptor_offset, gfc_conv_descriptor_dtype): Likewise.
(gfc_conv_descriptor_dimension, gfc_conv_descriptor_stride): Likewise.
(gfc_conv_descriptor_lbound, gfc_conv_descriptor_ubound): Likewise.
* fortran/trans-common.c (create_common): Likewise.
* fortran/trans-expr.c (gfc_conv_component_ref): Likewise.
* fortran/trans-io.c (set_parameter_value): Likewise.
(set_parameter_ref, set_string, set_flag, io_result): Likewise.
(transfer_expr): Likewise.
* fortran/trans-decl.c (gfc_trans_auto_character_variable):
Set up to get DECL_SIZE and DECL_SIZE_UNIT gimplified.
(gfc_simplify_function): New function.
(gfc_generate_function-code): Properly handle nested functions.
* fortran/trans.c (gfc_build_array_ref): Add two new operands
for ARRAY_REF.
* java/class.c (build_class_ref): Add new operand for COMPONENT_REF.
(build_static_field_ref): Likewise and add new operands for ARRAY_REF.
* java/constants.c (build_ref_from_constant_pool): Likewise.
* java/expr.c (build_java_array_length_access): Likewise.
(build_get_class, build_field_ref, build_known_method_ref): Likewise.
(invoke_build_dtable, build_invokevirtual): Likewise.
(build_invokeinterface, java_expand_expr): Likewise.
(emit_init_test_initialization): Likewise.
* java/java-gimplify.c (java_gimplify_new_array_init): Likewise.
* java/parse.y (make_qualifed_name, build_array_ref): Likewise.
* objc/ojbc-act.c (generate_static_references): Add additional
operands to ARRAY_REF.
(generate_strings, build_method_prototype_list_template): Likewise.
(generate_protocol_list): Likewise.
From-SVN: r83474
2004-06-22 05:07:05 +02:00
|
|
|
|
rval = build (ARRAY_REF, type, array, index, NULL_TREE, NULL_TREE);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
/* Array ref is const/volatile if the array elements are
|
|
|
|
|
|
or if the array is. */
|
|
|
|
|
|
TREE_READONLY (rval)
|
|
|
|
|
|
|= (TYPE_READONLY (TREE_TYPE (TREE_TYPE (array)))
|
|
|
|
|
|
| TREE_READONLY (array));
|
|
|
|
|
|
TREE_SIDE_EFFECTS (rval)
|
|
|
|
|
|
|= (TYPE_VOLATILE (TREE_TYPE (TREE_TYPE (array)))
|
|
|
|
|
|
| TREE_SIDE_EFFECTS (array));
|
|
|
|
|
|
TREE_THIS_VOLATILE (rval)
|
|
|
|
|
|
|= (TYPE_VOLATILE (TREE_TYPE (TREE_TYPE (array)))
|
|
|
|
|
|
/* This was added by rms on 16 Nov 91.
|
2003-06-22 15:41:26 +02:00
|
|
|
|
It fixes vol struct foo *a; a->elts[1]
|
1992-02-28 19:53:39 +01:00
|
|
|
|
in an inline function.
|
|
|
|
|
|
Hope it doesn't break something else. */
|
|
|
|
|
|
| TREE_THIS_VOLATILE (array));
|
|
|
|
|
|
return require_complete_type (fold (rval));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
tree ar = default_conversion (array);
|
|
|
|
|
|
tree ind = default_conversion (index);
|
|
|
|
|
|
|
1996-10-21 13:59:10 +02:00
|
|
|
|
/* Do the same warning check as above, but only on the part that's
|
|
|
|
|
|
syntactically the index and only if it is also semantically
|
|
|
|
|
|
the index. */
|
|
|
|
|
|
if (warn_char_subscripts
|
|
|
|
|
|
&& TREE_CODE (TREE_TYPE (index)) == INTEGER_TYPE
|
|
|
|
|
|
&& TYPE_MAIN_VARIANT (TREE_TYPE (index)) == char_type_node)
|
|
|
|
|
|
warning ("subscript has type `char'");
|
|
|
|
|
|
|
1992-02-28 19:53:39 +01:00
|
|
|
|
/* Put the integer in IND to simplify error checking. */
|
|
|
|
|
|
if (TREE_CODE (TREE_TYPE (ar)) == INTEGER_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
tree temp = ar;
|
|
|
|
|
|
ar = ind;
|
|
|
|
|
|
ind = temp;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (ar == error_mark_node)
|
|
|
|
|
|
return ar;
|
|
|
|
|
|
|
1996-03-23 13:07:23 +01:00
|
|
|
|
if (TREE_CODE (TREE_TYPE (ar)) != POINTER_TYPE
|
|
|
|
|
|
|| TREE_CODE (TREE_TYPE (TREE_TYPE (ar))) == FUNCTION_TYPE)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
|
|
|
|
|
error ("subscripted value is neither array nor pointer");
|
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
}
|
|
|
|
|
|
if (TREE_CODE (TREE_TYPE (ind)) != INTEGER_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
error ("array subscript is not an integer");
|
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return build_indirect_ref (build_binary_op (PLUS_EXPR, ar, ind, 0),
|
|
|
|
|
|
"array indexing");
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2000-06-20 00:28:28 +02:00
|
|
|
|
/* Build an external reference to identifier ID. FUN indicates
|
|
|
|
|
|
whether this will be used for a function call. */
|
|
|
|
|
|
tree
|
2003-06-22 15:41:26 +02:00
|
|
|
|
build_external_ref (tree id, int fun)
|
2000-06-20 00:28:28 +02:00
|
|
|
|
{
|
|
|
|
|
|
tree ref;
|
|
|
|
|
|
tree decl = lookup_name (id);
|
|
|
|
|
|
tree objc_ivar = lookup_objc_ivar (id);
|
|
|
|
|
|
|
c-decl.c (struct binding_level): Add shadowed_tags and function_body...
2003-04-10 Zack Weinberg <zack@codesourcery.com>
* c-decl.c (struct binding_level): Add shadowed_tags and
function_body; remove this_block, tag_transparent, and
subblocks_tag_transparent; update comments.
(clear_binding_level, lookup_tag_reverse): Kill.
(make_binding_level): Use ggc_alloc_cleared or memset.
(lookup_tag): Remove struct binding_level* parameter. All
callers changed. Just look at IDENTIFIER_TAG_VALUE, and
current_binding_level->tags if asked for thislevel_only or if
we might have to diagnose "struct foo; union foo;"
(pushlevel): Ignore argument. Do not push another binding
level on the transition from the parameters to the top level
of the function body; just tweak the flags and proceed.
(poplevel): Overhaul. Clear IDENTIFIER_TAG_VALUEs; on exiting
a function body, separate the parameter list from the
top-level local variables.
(set_block): Do nothing.
(pushtag): Set IDENTIFIER_TAG_VALUE and add an entry to
shadowed_tags if necessary.
(warn_if_shadowing): Nuke the special case for local shadowing
parameter.
(pushdecl): Do not create a shadow entry if we are replacing
an older decl in the same binding level.
(pushdecl_function_level): Tweak for new way of indicating
function scope.
(shadow_tag_warned): Use TYPE_NAME, not lookup_tag_reverse.
(start_function): Don't set subblocks_tag_transparent.
(finish_function): Fix up the binding_level stack for totally
empty functions. Otherwise, don't call poplevel.
* c-common.c (shadow_warning): MANDATORY argument is no longer
necessary. Always use plain warning.
* c-common.h: Update to match.
* cfglayout.c (scope_to_insns_initialize): Clear block when we
hit the FUNCTION_DECL.
* function.c: Do not create cyclic tree structure.
2003-04-10 Zack Weinberg <zack@codesourcery.com>
* c-tree.h (struct lang_identifier): Replace global_value,
local_value members with symbol_value, tag_value. Kill
implicit_decl and limbo_value.
(IDENTIFIER_GLOBAL_VALUE, IDENTIFIER_LOCAL_VALUE,
IDENTIFIER_LIMBO_VALUE, IDENTIFIER_IMPLICIT_DECL,
C_MISSING_PROTOTYPE_WARNED): Kill.
(IDENTIFIER_SYMBOL_VALUE, IDENTIFIER_TAG_VALUE,
C_DECL_IMPLICIT, C_DECL_ISNT_PROTOTYPE): New.
(C_DECL_ANTICIPATED): Rename to C_DECL_INVISIBLE.
(implicit_decl_warning, lookup_name_current_level,
record_function_scope_shadow): Don't prototype.
(pushdecl_function_level): Prototype.
* c-decl.c (truly_local_externals): New variable.
(struct binding_level): Adjust commentary.
(get_function_binding_level, clear_limbo_values,
record_function_scope_shadow): Kill.
(lookup_name_current_level, implicit_decl_warning): Are now static.
(any_external_decl, record_external_decl): New static functions.
(clone_underlying type): Split out of pushdecl.
(c_print_identifier): Update to match changes to struct
lang_identifier.
(poplevel): Delete #if 0 block. Make externals invisible
instead of clearing their IDENTIFIER_SYMBOL_VALUEs. Don't
call clear_limbo_values. Refer to IDENTIFIER_SYMBOL_VALUE not
IDENTIFIER_GLOBAL_VALUE or IDENTIFIER_LOCAL_VALUE.
(duplicate-decls): For real parm decl after a forward decl,
set TREE_ASM_WRITTEN here. Allow void foo(...) followed by
foo(...) { } with only a warning. Say whether a previous
declaration was implicit.
(warn_if_shadowing): Now handles all shadowing, not just
local-over-local. Clarify comments.
(pushdecl): Rewritten. There is no longer a distinction
between global and local symbol values; they're all
IDENTIFIER_SYMBOL_VALUE. Call record_external_decl on all
DECL_EXTERNAL decls, and use any_external_decl to check
against previous externals. Kill #if 0 blocks. Don't
tolerate error_mark_node being NULL.
(pushdecl_top_level): Handle only those cases which
Objective C (the only user) needs.
(pushdecl_function_level): New function.
(implicitly_declare): Create ordinary decls with
C_DECL_IMPLICIT set. Recycle old decls, however they got
created.
(lookup_name): It's always IDENTIFIER_SYMBOL_VALUE. Return 0
for C_DECL_INVISIBLE symbols.
(lookup_name_current_level): Likewise. Use chain_member.
(c_make_fname_decl): Don't muck with DECL_CONTEXT.
Use pushdecl_function_level.
(builtin_function): Use C_DECL_INVISIBLE.
(start_function): Don't muck with IDENTIFIER_IMPLICIT_DECL.
Use C_DECL_ISNT_PROTOTYPE and C_DECL_IMPLICIT.
(store_parm_decls): It's IDENTIFIER_SYMBOL_VALUE now.
(identifier_global_value): Same. Must scan
global_binding_level in extremis.
* c-typeck.c (undeclared_variable): New static function, split
from build_external_ref.
(build_external_ref): Use DECL_CONTEXT, not
IDENTIFIER_LOCAL_VALUE, to decide whether a local hides
an instance variable. Restructure for clarity.
* objc/objc-act.c: Use identifier_global_value, not
IDENTIFIER_GLOBAL_VALUE.
cp:
* decl.c: Update all calls to shadow_warning.
testsuite:
* gcc.c-torture/execute/builtin-noret-2.c: New.
* gcc.c-torture/execute/builtin-noret-2.x: New.
XFAIL builtin-noret-2.c at -O1 and above.
* gcc.dg/redecl.c: New.
* gcc.dg/Wshadow-1.c: Update error regexps.
From-SVN: r65460
2003-04-11 06:26:55 +02:00
|
|
|
|
if (decl && decl != error_mark_node)
|
2000-06-20 00:28:28 +02:00
|
|
|
|
{
|
|
|
|
|
|
/* Properly declared variable or function reference. */
|
|
|
|
|
|
if (!objc_ivar)
|
|
|
|
|
|
ref = decl;
|
2003-08-29 23:57:05 +02:00
|
|
|
|
else if (decl != objc_ivar && !DECL_FILE_SCOPE_P (decl))
|
2000-06-20 00:28:28 +02:00
|
|
|
|
{
|
|
|
|
|
|
warning ("local declaration of `%s' hides instance variable",
|
|
|
|
|
|
IDENTIFIER_POINTER (id));
|
|
|
|
|
|
ref = decl;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
ref = objc_ivar;
|
|
|
|
|
|
}
|
c-decl.c (struct binding_level): Add shadowed_tags and function_body...
2003-04-10 Zack Weinberg <zack@codesourcery.com>
* c-decl.c (struct binding_level): Add shadowed_tags and
function_body; remove this_block, tag_transparent, and
subblocks_tag_transparent; update comments.
(clear_binding_level, lookup_tag_reverse): Kill.
(make_binding_level): Use ggc_alloc_cleared or memset.
(lookup_tag): Remove struct binding_level* parameter. All
callers changed. Just look at IDENTIFIER_TAG_VALUE, and
current_binding_level->tags if asked for thislevel_only or if
we might have to diagnose "struct foo; union foo;"
(pushlevel): Ignore argument. Do not push another binding
level on the transition from the parameters to the top level
of the function body; just tweak the flags and proceed.
(poplevel): Overhaul. Clear IDENTIFIER_TAG_VALUEs; on exiting
a function body, separate the parameter list from the
top-level local variables.
(set_block): Do nothing.
(pushtag): Set IDENTIFIER_TAG_VALUE and add an entry to
shadowed_tags if necessary.
(warn_if_shadowing): Nuke the special case for local shadowing
parameter.
(pushdecl): Do not create a shadow entry if we are replacing
an older decl in the same binding level.
(pushdecl_function_level): Tweak for new way of indicating
function scope.
(shadow_tag_warned): Use TYPE_NAME, not lookup_tag_reverse.
(start_function): Don't set subblocks_tag_transparent.
(finish_function): Fix up the binding_level stack for totally
empty functions. Otherwise, don't call poplevel.
* c-common.c (shadow_warning): MANDATORY argument is no longer
necessary. Always use plain warning.
* c-common.h: Update to match.
* cfglayout.c (scope_to_insns_initialize): Clear block when we
hit the FUNCTION_DECL.
* function.c: Do not create cyclic tree structure.
2003-04-10 Zack Weinberg <zack@codesourcery.com>
* c-tree.h (struct lang_identifier): Replace global_value,
local_value members with symbol_value, tag_value. Kill
implicit_decl and limbo_value.
(IDENTIFIER_GLOBAL_VALUE, IDENTIFIER_LOCAL_VALUE,
IDENTIFIER_LIMBO_VALUE, IDENTIFIER_IMPLICIT_DECL,
C_MISSING_PROTOTYPE_WARNED): Kill.
(IDENTIFIER_SYMBOL_VALUE, IDENTIFIER_TAG_VALUE,
C_DECL_IMPLICIT, C_DECL_ISNT_PROTOTYPE): New.
(C_DECL_ANTICIPATED): Rename to C_DECL_INVISIBLE.
(implicit_decl_warning, lookup_name_current_level,
record_function_scope_shadow): Don't prototype.
(pushdecl_function_level): Prototype.
* c-decl.c (truly_local_externals): New variable.
(struct binding_level): Adjust commentary.
(get_function_binding_level, clear_limbo_values,
record_function_scope_shadow): Kill.
(lookup_name_current_level, implicit_decl_warning): Are now static.
(any_external_decl, record_external_decl): New static functions.
(clone_underlying type): Split out of pushdecl.
(c_print_identifier): Update to match changes to struct
lang_identifier.
(poplevel): Delete #if 0 block. Make externals invisible
instead of clearing their IDENTIFIER_SYMBOL_VALUEs. Don't
call clear_limbo_values. Refer to IDENTIFIER_SYMBOL_VALUE not
IDENTIFIER_GLOBAL_VALUE or IDENTIFIER_LOCAL_VALUE.
(duplicate-decls): For real parm decl after a forward decl,
set TREE_ASM_WRITTEN here. Allow void foo(...) followed by
foo(...) { } with only a warning. Say whether a previous
declaration was implicit.
(warn_if_shadowing): Now handles all shadowing, not just
local-over-local. Clarify comments.
(pushdecl): Rewritten. There is no longer a distinction
between global and local symbol values; they're all
IDENTIFIER_SYMBOL_VALUE. Call record_external_decl on all
DECL_EXTERNAL decls, and use any_external_decl to check
against previous externals. Kill #if 0 blocks. Don't
tolerate error_mark_node being NULL.
(pushdecl_top_level): Handle only those cases which
Objective C (the only user) needs.
(pushdecl_function_level): New function.
(implicitly_declare): Create ordinary decls with
C_DECL_IMPLICIT set. Recycle old decls, however they got
created.
(lookup_name): It's always IDENTIFIER_SYMBOL_VALUE. Return 0
for C_DECL_INVISIBLE symbols.
(lookup_name_current_level): Likewise. Use chain_member.
(c_make_fname_decl): Don't muck with DECL_CONTEXT.
Use pushdecl_function_level.
(builtin_function): Use C_DECL_INVISIBLE.
(start_function): Don't muck with IDENTIFIER_IMPLICIT_DECL.
Use C_DECL_ISNT_PROTOTYPE and C_DECL_IMPLICIT.
(store_parm_decls): It's IDENTIFIER_SYMBOL_VALUE now.
(identifier_global_value): Same. Must scan
global_binding_level in extremis.
* c-typeck.c (undeclared_variable): New static function, split
from build_external_ref.
(build_external_ref): Use DECL_CONTEXT, not
IDENTIFIER_LOCAL_VALUE, to decide whether a local hides
an instance variable. Restructure for clarity.
* objc/objc-act.c: Use identifier_global_value, not
IDENTIFIER_GLOBAL_VALUE.
cp:
* decl.c: Update all calls to shadow_warning.
testsuite:
* gcc.c-torture/execute/builtin-noret-2.c: New.
* gcc.c-torture/execute/builtin-noret-2.x: New.
XFAIL builtin-noret-2.c at -O1 and above.
* gcc.dg/redecl.c: New.
* gcc.dg/Wshadow-1.c: Update error regexps.
From-SVN: r65460
2003-04-11 06:26:55 +02:00
|
|
|
|
else if (objc_ivar)
|
|
|
|
|
|
ref = objc_ivar;
|
|
|
|
|
|
else if (fun)
|
|
|
|
|
|
/* Implicit function declaration. */
|
|
|
|
|
|
ref = implicitly_declare (id);
|
|
|
|
|
|
else if (decl == error_mark_node)
|
|
|
|
|
|
/* Don't complain about something that's already been
|
|
|
|
|
|
complained about. */
|
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
undeclared_variable (id);
|
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
}
|
2000-06-20 00:28:28 +02:00
|
|
|
|
|
|
|
|
|
|
if (TREE_TYPE (ref) == error_mark_node)
|
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
|
c-decl.c (struct binding_level): Add shadowed_tags and function_body...
2003-04-10 Zack Weinberg <zack@codesourcery.com>
* c-decl.c (struct binding_level): Add shadowed_tags and
function_body; remove this_block, tag_transparent, and
subblocks_tag_transparent; update comments.
(clear_binding_level, lookup_tag_reverse): Kill.
(make_binding_level): Use ggc_alloc_cleared or memset.
(lookup_tag): Remove struct binding_level* parameter. All
callers changed. Just look at IDENTIFIER_TAG_VALUE, and
current_binding_level->tags if asked for thislevel_only or if
we might have to diagnose "struct foo; union foo;"
(pushlevel): Ignore argument. Do not push another binding
level on the transition from the parameters to the top level
of the function body; just tweak the flags and proceed.
(poplevel): Overhaul. Clear IDENTIFIER_TAG_VALUEs; on exiting
a function body, separate the parameter list from the
top-level local variables.
(set_block): Do nothing.
(pushtag): Set IDENTIFIER_TAG_VALUE and add an entry to
shadowed_tags if necessary.
(warn_if_shadowing): Nuke the special case for local shadowing
parameter.
(pushdecl): Do not create a shadow entry if we are replacing
an older decl in the same binding level.
(pushdecl_function_level): Tweak for new way of indicating
function scope.
(shadow_tag_warned): Use TYPE_NAME, not lookup_tag_reverse.
(start_function): Don't set subblocks_tag_transparent.
(finish_function): Fix up the binding_level stack for totally
empty functions. Otherwise, don't call poplevel.
* c-common.c (shadow_warning): MANDATORY argument is no longer
necessary. Always use plain warning.
* c-common.h: Update to match.
* cfglayout.c (scope_to_insns_initialize): Clear block when we
hit the FUNCTION_DECL.
* function.c: Do not create cyclic tree structure.
2003-04-10 Zack Weinberg <zack@codesourcery.com>
* c-tree.h (struct lang_identifier): Replace global_value,
local_value members with symbol_value, tag_value. Kill
implicit_decl and limbo_value.
(IDENTIFIER_GLOBAL_VALUE, IDENTIFIER_LOCAL_VALUE,
IDENTIFIER_LIMBO_VALUE, IDENTIFIER_IMPLICIT_DECL,
C_MISSING_PROTOTYPE_WARNED): Kill.
(IDENTIFIER_SYMBOL_VALUE, IDENTIFIER_TAG_VALUE,
C_DECL_IMPLICIT, C_DECL_ISNT_PROTOTYPE): New.
(C_DECL_ANTICIPATED): Rename to C_DECL_INVISIBLE.
(implicit_decl_warning, lookup_name_current_level,
record_function_scope_shadow): Don't prototype.
(pushdecl_function_level): Prototype.
* c-decl.c (truly_local_externals): New variable.
(struct binding_level): Adjust commentary.
(get_function_binding_level, clear_limbo_values,
record_function_scope_shadow): Kill.
(lookup_name_current_level, implicit_decl_warning): Are now static.
(any_external_decl, record_external_decl): New static functions.
(clone_underlying type): Split out of pushdecl.
(c_print_identifier): Update to match changes to struct
lang_identifier.
(poplevel): Delete #if 0 block. Make externals invisible
instead of clearing their IDENTIFIER_SYMBOL_VALUEs. Don't
call clear_limbo_values. Refer to IDENTIFIER_SYMBOL_VALUE not
IDENTIFIER_GLOBAL_VALUE or IDENTIFIER_LOCAL_VALUE.
(duplicate-decls): For real parm decl after a forward decl,
set TREE_ASM_WRITTEN here. Allow void foo(...) followed by
foo(...) { } with only a warning. Say whether a previous
declaration was implicit.
(warn_if_shadowing): Now handles all shadowing, not just
local-over-local. Clarify comments.
(pushdecl): Rewritten. There is no longer a distinction
between global and local symbol values; they're all
IDENTIFIER_SYMBOL_VALUE. Call record_external_decl on all
DECL_EXTERNAL decls, and use any_external_decl to check
against previous externals. Kill #if 0 blocks. Don't
tolerate error_mark_node being NULL.
(pushdecl_top_level): Handle only those cases which
Objective C (the only user) needs.
(pushdecl_function_level): New function.
(implicitly_declare): Create ordinary decls with
C_DECL_IMPLICIT set. Recycle old decls, however they got
created.
(lookup_name): It's always IDENTIFIER_SYMBOL_VALUE. Return 0
for C_DECL_INVISIBLE symbols.
(lookup_name_current_level): Likewise. Use chain_member.
(c_make_fname_decl): Don't muck with DECL_CONTEXT.
Use pushdecl_function_level.
(builtin_function): Use C_DECL_INVISIBLE.
(start_function): Don't muck with IDENTIFIER_IMPLICIT_DECL.
Use C_DECL_ISNT_PROTOTYPE and C_DECL_IMPLICIT.
(store_parm_decls): It's IDENTIFIER_SYMBOL_VALUE now.
(identifier_global_value): Same. Must scan
global_binding_level in extremis.
* c-typeck.c (undeclared_variable): New static function, split
from build_external_ref.
(build_external_ref): Use DECL_CONTEXT, not
IDENTIFIER_LOCAL_VALUE, to decide whether a local hides
an instance variable. Restructure for clarity.
* objc/objc-act.c: Use identifier_global_value, not
IDENTIFIER_GLOBAL_VALUE.
cp:
* decl.c: Update all calls to shadow_warning.
testsuite:
* gcc.c-torture/execute/builtin-noret-2.c: New.
* gcc.c-torture/execute/builtin-noret-2.x: New.
XFAIL builtin-noret-2.c at -O1 and above.
* gcc.dg/redecl.c: New.
* gcc.dg/Wshadow-1.c: Update error regexps.
From-SVN: r65460
2003-04-11 06:26:55 +02:00
|
|
|
|
if (TREE_DEPRECATED (ref))
|
|
|
|
|
|
warn_deprecated_use (ref);
|
|
|
|
|
|
|
2002-08-15 23:16:23 +02:00
|
|
|
|
if (!skip_evaluation)
|
|
|
|
|
|
assemble_external (ref);
|
2000-06-20 00:28:28 +02:00
|
|
|
|
TREE_USED (ref) = 1;
|
|
|
|
|
|
|
|
|
|
|
|
if (TREE_CODE (ref) == CONST_DECL)
|
|
|
|
|
|
{
|
|
|
|
|
|
ref = DECL_INITIAL (ref);
|
|
|
|
|
|
TREE_CONSTANT (ref) = 1;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
TREE_INVARIANT (ref) = 1;
|
2000-06-20 00:28:28 +02:00
|
|
|
|
}
|
2003-04-18 08:45:15 +02:00
|
|
|
|
else if (current_function_decl != 0
|
2003-08-29 23:57:05 +02:00
|
|
|
|
&& !DECL_FILE_SCOPE_P (current_function_decl)
|
2003-04-18 08:45:15 +02:00
|
|
|
|
&& (TREE_CODE (ref) == VAR_DECL
|
|
|
|
|
|
|| TREE_CODE (ref) == PARM_DECL
|
|
|
|
|
|
|| TREE_CODE (ref) == FUNCTION_DECL))
|
|
|
|
|
|
{
|
|
|
|
|
|
tree context = decl_function_context (ref);
|
2003-06-22 15:41:26 +02:00
|
|
|
|
|
2003-04-18 08:45:15 +02:00
|
|
|
|
if (context != 0 && context != current_function_decl)
|
|
|
|
|
|
DECL_NONLOCAL (ref) = 1;
|
|
|
|
|
|
}
|
2000-06-20 00:28:28 +02:00
|
|
|
|
|
|
|
|
|
|
return ref;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
1992-02-28 19:53:39 +01:00
|
|
|
|
/* Build a function call to function FUNCTION with parameters PARAMS.
|
|
|
|
|
|
PARAMS is a list--a chain of TREE_LIST nodes--in which the
|
|
|
|
|
|
TREE_VALUE of each node is a parameter-expression.
|
|
|
|
|
|
FUNCTION's data type may be a function type or a pointer-to-function. */
|
|
|
|
|
|
|
|
|
|
|
|
tree
|
2003-06-22 15:41:26 +02:00
|
|
|
|
build_function_call (tree function, tree params)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2001-10-11 05:16:15 +02:00
|
|
|
|
tree fntype, fundecl = 0;
|
|
|
|
|
|
tree coerced_params;
|
2002-12-16 19:23:00 +01:00
|
|
|
|
tree name = NULL_TREE, result;
|
2003-12-20 08:12:39 +01:00
|
|
|
|
tree tem;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
1992-07-09 01:30:46 +02:00
|
|
|
|
/* Strip NON_LVALUE_EXPRs, etc., since we aren't using as an lvalue. */
|
1992-07-10 03:49:46 +02:00
|
|
|
|
STRIP_TYPE_NOPS (function);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
|
|
|
|
|
/* Convert anything with function type to a pointer-to-function. */
|
|
|
|
|
|
if (TREE_CODE (function) == FUNCTION_DECL)
|
|
|
|
|
|
{
|
|
|
|
|
|
name = DECL_NAME (function);
|
1993-10-07 00:32:11 +01:00
|
|
|
|
|
1992-02-28 19:53:39 +01:00
|
|
|
|
/* Differs from default_conversion by not setting TREE_ADDRESSABLE
|
|
|
|
|
|
(because calling an inline function does not mean the function
|
|
|
|
|
|
needs to be separately compiled). */
|
|
|
|
|
|
fntype = build_type_variant (TREE_TYPE (function),
|
|
|
|
|
|
TREE_READONLY (function),
|
|
|
|
|
|
TREE_THIS_VOLATILE (function));
|
1993-02-27 23:12:42 +01:00
|
|
|
|
fundecl = function;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
function = build1 (ADDR_EXPR, build_pointer_type (fntype), function);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
function = default_conversion (function);
|
|
|
|
|
|
|
|
|
|
|
|
fntype = TREE_TYPE (function);
|
|
|
|
|
|
|
|
|
|
|
|
if (TREE_CODE (fntype) == ERROR_MARK)
|
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
|
|
|
|
|
|
if (!(TREE_CODE (fntype) == POINTER_TYPE
|
|
|
|
|
|
&& TREE_CODE (TREE_TYPE (fntype)) == FUNCTION_TYPE))
|
|
|
|
|
|
{
|
|
|
|
|
|
error ("called object is not a function");
|
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2002-02-06 21:40:18 +01:00
|
|
|
|
if (fundecl && TREE_THIS_VOLATILE (fundecl))
|
|
|
|
|
|
current_function_returns_abnormally = 1;
|
|
|
|
|
|
|
1992-02-28 19:53:39 +01:00
|
|
|
|
/* fntype now gets the type of function pointed to. */
|
|
|
|
|
|
fntype = TREE_TYPE (fntype);
|
|
|
|
|
|
|
2003-12-20 08:12:39 +01:00
|
|
|
|
/* Check that the function is called through a compatible prototype.
|
|
|
|
|
|
If it is not, replace the call by a trap, wrapped up in a compound
|
|
|
|
|
|
expression if necessary. This has the nice side-effect to prevent
|
|
|
|
|
|
the tree-inliner from generating invalid assignment trees which may
|
|
|
|
|
|
blow up in the RTL expander later.
|
|
|
|
|
|
|
|
|
|
|
|
??? This doesn't work for Objective-C because objc_comptypes
|
|
|
|
|
|
refuses to compare function prototypes, yet the compiler appears
|
|
|
|
|
|
to build calls that are flagged as invalid by C's comptypes. */
|
|
|
|
|
|
if (! c_dialect_objc ()
|
|
|
|
|
|
&& TREE_CODE (function) == NOP_EXPR
|
|
|
|
|
|
&& TREE_CODE (tem = TREE_OPERAND (function, 0)) == ADDR_EXPR
|
|
|
|
|
|
&& TREE_CODE (tem = TREE_OPERAND (tem, 0)) == FUNCTION_DECL
|
2004-06-13 19:14:09 +02:00
|
|
|
|
&& ! comptypes (fntype, TREE_TYPE (tem)))
|
2003-12-20 08:12:39 +01:00
|
|
|
|
{
|
|
|
|
|
|
tree return_type = TREE_TYPE (fntype);
|
|
|
|
|
|
tree trap = build_function_call (built_in_decls[BUILT_IN_TRAP],
|
|
|
|
|
|
NULL_TREE);
|
|
|
|
|
|
|
|
|
|
|
|
/* This situation leads to run-time undefined behavior. We can't,
|
|
|
|
|
|
therefore, simply error unless we can prove that all possible
|
|
|
|
|
|
executions of the program must execute the code. */
|
|
|
|
|
|
warning ("function called through a non-compatible type");
|
|
|
|
|
|
|
2004-02-23 13:41:43 +01:00
|
|
|
|
/* We can, however, treat "undefined" any way we please.
|
|
|
|
|
|
Call abort to encourage the user to fix the program. */
|
|
|
|
|
|
inform ("if this code is reached, the program will abort");
|
|
|
|
|
|
|
2003-12-20 08:12:39 +01:00
|
|
|
|
if (VOID_TYPE_P (return_type))
|
|
|
|
|
|
return trap;
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
tree rhs;
|
|
|
|
|
|
|
|
|
|
|
|
if (AGGREGATE_TYPE_P (return_type))
|
|
|
|
|
|
rhs = build_compound_literal (return_type,
|
|
|
|
|
|
build_constructor (return_type,
|
|
|
|
|
|
NULL_TREE));
|
|
|
|
|
|
else
|
|
|
|
|
|
rhs = fold (build1 (NOP_EXPR, return_type, integer_zero_node));
|
|
|
|
|
|
|
|
|
|
|
|
return build (COMPOUND_EXPR, return_type, trap, rhs);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
1992-02-28 19:53:39 +01:00
|
|
|
|
/* Convert the parameters to the types declared in the
|
|
|
|
|
|
function prototype, or apply default promotions. */
|
|
|
|
|
|
|
|
|
|
|
|
coerced_params
|
1993-02-27 23:12:42 +01:00
|
|
|
|
= convert_arguments (TYPE_ARG_TYPES (fntype), params, name, fundecl);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2002-05-23 17:48:05 +02:00
|
|
|
|
/* Check that the arguments to the function are valid. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2002-05-23 17:48:05 +02:00
|
|
|
|
check_function_arguments (TYPE_ATTRIBUTES (fntype), coerced_params);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2000-01-24 21:10:04 +01:00
|
|
|
|
result = build (CALL_EXPR, TREE_TYPE (fntype),
|
|
|
|
|
|
function, coerced_params, NULL_TREE);
|
|
|
|
|
|
TREE_SIDE_EFFECTS (result) = 1;
|
2004-06-07 20:49:36 +02:00
|
|
|
|
|
|
|
|
|
|
if (require_constant_value)
|
|
|
|
|
|
{
|
|
|
|
|
|
result = fold_initializer (result);
|
|
|
|
|
|
|
|
|
|
|
|
if (TREE_CONSTANT (result)
|
|
|
|
|
|
&& (name == NULL_TREE
|
|
|
|
|
|
|| strncmp (IDENTIFIER_POINTER (name), "__builtin_", 10) != 0))
|
|
|
|
|
|
pedwarn_init ("initializer element is not constant");
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
result = fold (result);
|
2000-11-01 18:02:45 +01:00
|
|
|
|
|
2000-06-05 15:16:14 +02:00
|
|
|
|
if (VOID_TYPE_P (TREE_TYPE (result)))
|
2000-01-24 21:10:04 +01:00
|
|
|
|
return result;
|
|
|
|
|
|
return require_complete_type (result);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Convert the argument expressions in the list VALUES
|
|
|
|
|
|
to the types in the list TYPELIST. The result is a list of converted
|
|
|
|
|
|
argument expressions.
|
|
|
|
|
|
|
|
|
|
|
|
If TYPELIST is exhausted, or when an element has NULL as its type,
|
|
|
|
|
|
perform the default conversions.
|
|
|
|
|
|
|
|
|
|
|
|
PARMLIST is the chain of parm decls for the function being called.
|
|
|
|
|
|
It may be 0, if that info is not available.
|
|
|
|
|
|
It is used only for generating error messages.
|
|
|
|
|
|
|
|
|
|
|
|
NAME is an IDENTIFIER_NODE or 0. It is used only for error messages.
|
|
|
|
|
|
|
|
|
|
|
|
This is also where warnings about wrong number of args are generated.
|
|
|
|
|
|
|
|
|
|
|
|
Both VALUES and the returned value are chains of TREE_LIST nodes
|
|
|
|
|
|
with the elements of the list in the TREE_VALUE slots of those nodes. */
|
|
|
|
|
|
|
|
|
|
|
|
static tree
|
2003-06-22 15:41:26 +02:00
|
|
|
|
convert_arguments (tree typelist, tree values, tree name, tree fundecl)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2001-10-11 05:16:15 +02:00
|
|
|
|
tree typetail, valtail;
|
|
|
|
|
|
tree result = NULL;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
int parmnum;
|
|
|
|
|
|
|
|
|
|
|
|
/* Scan the given expressions and types, producing individual
|
|
|
|
|
|
converted arguments and pushing them on RESULT in reverse order. */
|
|
|
|
|
|
|
|
|
|
|
|
for (valtail = values, typetail = typelist, parmnum = 0;
|
|
|
|
|
|
valtail;
|
|
|
|
|
|
valtail = TREE_CHAIN (valtail), parmnum++)
|
|
|
|
|
|
{
|
2001-10-11 05:16:15 +02:00
|
|
|
|
tree type = typetail ? TREE_VALUE (typetail) : 0;
|
|
|
|
|
|
tree val = TREE_VALUE (valtail);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
|
|
|
|
|
if (type == void_type_node)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (name)
|
|
|
|
|
|
error ("too many arguments to function `%s'",
|
|
|
|
|
|
IDENTIFIER_POINTER (name));
|
|
|
|
|
|
else
|
|
|
|
|
|
error ("too many arguments to function");
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Strip NON_LVALUE_EXPRs since we aren't using as an lvalue. */
|
1992-07-09 01:30:46 +02:00
|
|
|
|
/* Do not use STRIP_NOPS here! We do not want an enumerator with value 0
|
|
|
|
|
|
to convert automatically to a pointer. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
if (TREE_CODE (val) == NON_LVALUE_EXPR)
|
|
|
|
|
|
val = TREE_OPERAND (val, 0);
|
|
|
|
|
|
|
re PR c/461 (non-lvalue arrays)
* c-common.c (c_expand_expr_stmt): Apply default conversions to
non-lvalue arrays if C99.
* c-typeck.c (default_conversion): Split out code handling
array-to-pointer and function-to-pointer conversions into a
separate default_function_array_conversion function.
(default_function_array_conversion): New function. Keep track of
whether any NON_LVALUE_EXPRs were stripped. Return non-lvalue
arrays unchanged outside C99 mode instead of giving an error for
them.
(build_component_ref): Use pedantic_non_lvalue when handling
COMPOUND_EXPR. Don't handle COND_EXPR specially.
(convert_arguments): Use default_function_array_conversion.
(build_unary_op): For ADDR_EXPR, take a flag indicating whether
non-lvalues are OK.
(unary_complex_lvalue): Likewise.
(internal_build_compound_expr): Use
default_function_array_conversion. Apply default conversions to
function in compound expression.
(build_c_cast, build_modify_expr, digest_init, build_asm_stmt):
Use default_function_array_conversion.
* doc/extend.texi: Update documentation of subscripting non-lvalue
arrays.
Fixes PR c/461.
testsuite:
* gcc.dg/c90-array-lval-1.c, gcc.dg/c90-array-lval-2.c,
gcc.dg/c99-array-lval-1.c, gcc.dg/c99-array-lval-2.c: Remove
XFAILs. Adjust expected error texts.
* gcc.c-torture/compile/20011106-1.c,
gcc.c-torture/compile/20011106-2.c, gcc.dg/c90-array-lval-3.c,
gcc.dg/c90-array-lval-4.c, gcc.dg/c90-array-lval-5.c,
gcc.dg/c99-array-lval-3.c, gcc.dg/c99-array-lval-4.c,
gcc.dg/c99-array-lval-5.c: New tests.
From-SVN: r46805
2001-11-06 13:39:36 +01:00
|
|
|
|
val = default_function_array_conversion (val);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
|
|
|
|
|
val = require_complete_type (val);
|
|
|
|
|
|
|
|
|
|
|
|
if (type != 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Formal parm type is specified by a function prototype. */
|
|
|
|
|
|
tree parmval;
|
|
|
|
|
|
|
tree.h (COMPLETE_TYPE_P): New macro.
gcc
* tree.h (COMPLETE_TYPE_P): New macro.
(COMPLETE_OR_VOID_TYPE_P): New macro.
(COMPLETE_OR_UNBOUND_ARRAY_TYPE_P): New macro.
* stor-layout.c (layout_type, case VOID_TYPE): Don't set TYPE_SIZE.
* c-aux-info.c (gen_type): Use them.
* c-common.c (c_expand_expr_stmt): Likewise.
* c-decl.c (poplevel, pushdecl, start_decl, finish_decl,
grokdeclarator, grokparms, finish_struct, start_function,
store_parm_decls, combine_parm_decls): Likewise.
* c-parse.y (cast_expr): Likewise.
* c-typeck.c (require_complete_type, c_sizeof, c_sizeof_nowarn,
c_size_in_bytes, c_alignof, build_component_ref,
build_indirect_ref, build_array_ref, convert_arguments,
build_binary_op, pointer_diff, build_unary_op, digest_init: Likewise.
* calls.c (initialize_argument_information): Likewise.
* convert.c (convert_to_integer): Likewise.
* dbxout.c (dbxout_typedefs, dbxout_type, dbxout_symbol): Likewise.
* dwarfout.c (location_or_const_value_attribute,
output_enumeration_type_die, output_structure_type_die,
output_union_type_die, output_type): Likewise.
* expr.c (safe_from_p, expand_expr): Likewise.
* function.c (assign_parms): Likewise.
* sdbout.c (sdbout_symbol, sdbout_one_type): Likewise.
* tree.c (build_array_type, build_function_type,
build_method_type, build_offset_type, build_complex_type): Likewise.
* c-parse.c, c-parse.h: Regenerated.
gcc/cp
* typeck.c (require_complete_type, complete_type,
complete_type_or_else, c_sizeof, c_sizeof_nowarn,
build_array_ref, convert_arguments, pointer_diff,
build_x_unary_op, build_unary_op, build_c_cast,
build_modify_expr): Use COMPLETE_TYPE_P etc.
* call.c (is_complete, convert_like_real,
build_new_method_call): Likewise.
* class.c (build_vbase_pointer_fields, check_bases,
build_base_field, finish_struct_1, pushclass): Likewise.
* cvt.c (cp_convert_to_pointer, convert_to_void): Likewise.
* decl.c (maybe_process_template_type_declaration, pushtag,
pushdecl, redeclaration_error_message, start_decl, start_decl_1,
layout_var_decl, check_initializer, cp_finish_decl,
grokdeclarator, require_complete_types_for_parms,
grok_op_properties, xref_tag, xref_basetypes,
check_function_type): Likewise.
* decl2.c (check_classfn, reparse_absdcl_as_casts): Likewise.
* friend.c (do_friend): Likewise.
* init.c (build_offset_ref): Likewise.
* parse.y (structsp): Likewise.
* pt.c (maybe_process_partial_specialization,
tsubst_friend_function, instantiate_class_template, tsubst,
do_type_instantiation, instantiate_pending_templates): Likewise.
* repo.c (repo_get_id): Likewise.
* rtti.c (build_typeid, get_typeid, build_dynamic_cast_1,
synthesize_tinfo_var, emit_support_tinfos): Likewise.
* search.c (lookup_fnfields_1, lookup_conversions): Likewise.
* semantics.c (begin_class_definition): Likewise.
* tree.c (build_cplus_method_type): Likewise.
* typeck2.c (digest_init, build_functional_cast,
add_exception_specifier): Likewise.
* parse.h, parse.c: Regenerated.
From-SVN: r32671
2000-03-21 19:10:48 +01:00
|
|
|
|
if (!COMPLETE_TYPE_P (type))
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
|
|
|
|
|
error ("type of formal parameter %d is incomplete", parmnum + 1);
|
|
|
|
|
|
parmval = val;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
1992-03-14 06:07:15 +01:00
|
|
|
|
/* Optionally warn about conversions that
|
|
|
|
|
|
differ from the default conversions. */
|
2001-04-11 00:40:48 +02:00
|
|
|
|
if (warn_conversion || warn_traditional)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
|
|
|
|
|
int formal_prec = TYPE_PRECISION (type);
|
|
|
|
|
|
|
1994-09-02 01:13:19 +02:00
|
|
|
|
if (INTEGRAL_TYPE_P (type)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
&& TREE_CODE (TREE_TYPE (val)) == REAL_TYPE)
|
1992-05-20 06:04:55 +02:00
|
|
|
|
warn_for_assignment ("%s as integer rather than floating due to prototype", (char *) 0, name, parmnum + 1);
|
2001-04-11 00:40:48 +02:00
|
|
|
|
if (INTEGRAL_TYPE_P (type)
|
|
|
|
|
|
&& TREE_CODE (TREE_TYPE (val)) == COMPLEX_TYPE)
|
|
|
|
|
|
warn_for_assignment ("%s as integer rather than complex due to prototype", (char *) 0, name, parmnum + 1);
|
1994-09-02 01:13:19 +02:00
|
|
|
|
else if (TREE_CODE (type) == COMPLEX_TYPE
|
|
|
|
|
|
&& TREE_CODE (TREE_TYPE (val)) == REAL_TYPE)
|
|
|
|
|
|
warn_for_assignment ("%s as complex rather than floating due to prototype", (char *) 0, name, parmnum + 1);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
else if (TREE_CODE (type) == REAL_TYPE
|
1994-09-02 01:13:19 +02:00
|
|
|
|
&& INTEGRAL_TYPE_P (TREE_TYPE (val)))
|
1992-05-20 06:04:55 +02:00
|
|
|
|
warn_for_assignment ("%s as floating rather than integer due to prototype", (char *) 0, name, parmnum + 1);
|
2001-04-11 00:40:48 +02:00
|
|
|
|
else if (TREE_CODE (type) == COMPLEX_TYPE
|
|
|
|
|
|
&& INTEGRAL_TYPE_P (TREE_TYPE (val)))
|
|
|
|
|
|
warn_for_assignment ("%s as complex rather than integer due to prototype", (char *) 0, name, parmnum + 1);
|
1994-09-02 01:13:19 +02:00
|
|
|
|
else if (TREE_CODE (type) == REAL_TYPE
|
|
|
|
|
|
&& TREE_CODE (TREE_TYPE (val)) == COMPLEX_TYPE)
|
|
|
|
|
|
warn_for_assignment ("%s as floating rather than complex due to prototype", (char *) 0, name, parmnum + 1);
|
|
|
|
|
|
/* ??? At some point, messages should be written about
|
|
|
|
|
|
conversions between complex types, but that's too messy
|
|
|
|
|
|
to do now. */
|
1992-03-14 06:07:15 +01:00
|
|
|
|
else if (TREE_CODE (type) == REAL_TYPE
|
|
|
|
|
|
&& TREE_CODE (TREE_TYPE (val)) == REAL_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Warn if any argument is passed as `float',
|
1992-04-04 21:11:28 +02:00
|
|
|
|
since without a prototype it would be `double'. */
|
1992-03-14 06:07:15 +01:00
|
|
|
|
if (formal_prec == TYPE_PRECISION (float_type_node))
|
1992-05-20 06:04:55 +02:00
|
|
|
|
warn_for_assignment ("%s as `float' rather than `double' due to prototype", (char *) 0, name, parmnum + 1);
|
1992-03-14 06:07:15 +01:00
|
|
|
|
}
|
2001-04-17 04:21:10 +02:00
|
|
|
|
/* Detect integer changing in width or signedness.
|
|
|
|
|
|
These warnings are only activated with
|
|
|
|
|
|
-Wconversion, not with -Wtraditional. */
|
|
|
|
|
|
else if (warn_conversion && INTEGRAL_TYPE_P (type)
|
1994-09-02 01:13:19 +02:00
|
|
|
|
&& INTEGRAL_TYPE_P (TREE_TYPE (val)))
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
1992-03-14 06:07:15 +01:00
|
|
|
|
tree would_have_been = default_conversion (val);
|
|
|
|
|
|
tree type1 = TREE_TYPE (would_have_been);
|
|
|
|
|
|
|
1992-05-20 06:04:55 +02:00
|
|
|
|
if (TREE_CODE (type) == ENUMERAL_TYPE
|
2001-10-26 22:49:48 +02:00
|
|
|
|
&& (TYPE_MAIN_VARIANT (type)
|
|
|
|
|
|
== TYPE_MAIN_VARIANT (TREE_TYPE (val))))
|
1992-05-20 06:04:55 +02:00
|
|
|
|
/* No warning if function asks for enum
|
|
|
|
|
|
and the actual arg is that enum type. */
|
|
|
|
|
|
;
|
|
|
|
|
|
else if (formal_prec != TYPE_PRECISION (type1))
|
|
|
|
|
|
warn_for_assignment ("%s with different width due to prototype", (char *) 0, name, parmnum + 1);
|
builtins.c, [...]: Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* builtins.c, c-aux-info.c, c-common.c, c-cppbuiltin.c, c-decl.c:
Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* c-format.c, c-opts.c, c-pretty-print.c, c-typeck.c: Likewise.
* calls.c, convert.c, dbxout.c, dojump.c, dwarf2out.c: Likewise.
* expmed.c, expr.c, fold-const.c, function.c, integrate.c: Likewise.
* optabs.c, sdbout.c, stmt.c, stor-layout.c, tree-dump.c: Likewise.
* tree.c, config/iq2000/iq2000.c, config/m32r/m32r.c: Likewise.
* config/mips/mips.c, config/rs6000/rs6000.c: Likewise.
* config/s390/s390.c, config/sparc/sparc.c, objc/objc-act.c: Likewise.
* stor-layout.c (layout_type, case COMPLEX_TYPE): Test for
REAL_TYPE, not INTEGER_TYPE.
(layout_type, case VECTOR_TYPE): Simplify code.
* tree.c (build_vector_type_for_mode): Remove dup unsigned setting.
* tree.h: Update comments.
(STRIP_NOPS): Use TYPE_UNSIGNED.
(TYPE_UNSIGNED): New macro.
(TYPE_TRAP_SIGNED): Remove now redundant check.
(SAVE_EXPR_NOPLACEHOLDER): Don't use TREE_UNSIGNED.
* cp/call.c (joust): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* cp/class.c (check_bitfield_decl): Likewise.
* cp/cvt.c (type_promotes_to): Likewise.
* cp/decl.c (finish_enum): Likewise.
* cp/mangle.c (write_builtin_type): Likewise.
* cp/semantics.c (finish_switch_cond, finish_unary_op_expr): Likewise.
* cp/typeck.c (type_after_usual_arithmetic_conversions): Likewise.
(build_binary_op): Likewise.
* f/com.c (ffecom_arrayref_): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
(ffecom_expr_): Likewise.
* java/jcf-write.c (generate_bytecode_insns): Use TYPE_UNSIGNED.
* treelang/treetree.c (tree_lang_signed_or_unsigned_type):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/decl.c (gnat_to_gnu_entity, make_type_from_size):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/trans.c (tree_transform, convert_with_check): Likewise.
* ada/utils.c (gnat_signed_or_unsigned_type): Likewise.
(build_vms_descriptor, unchecked_convert): Likewise.
* ada/utils2.c (nonbinary_modular_operation): Likewise.
From-SVN: r80287
2004-04-01 05:50:43 +02:00
|
|
|
|
else if (TYPE_UNSIGNED (type) == TYPE_UNSIGNED (type1))
|
1992-03-14 06:07:15 +01:00
|
|
|
|
;
|
1992-07-06 02:37:19 +02:00
|
|
|
|
/* Don't complain if the formal parameter type
|
|
|
|
|
|
is an enum, because we can't tell now whether
|
|
|
|
|
|
the value was an enum--even the same enum. */
|
|
|
|
|
|
else if (TREE_CODE (type) == ENUMERAL_TYPE)
|
|
|
|
|
|
;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
else if (TREE_CODE (val) == INTEGER_CST
|
|
|
|
|
|
&& int_fits_type_p (val, type))
|
|
|
|
|
|
/* Change in signedness doesn't matter
|
|
|
|
|
|
if a constant value is unaffected. */
|
|
|
|
|
|
;
|
1993-07-12 00:44:54 +02:00
|
|
|
|
/* Likewise for a constant in a NOP_EXPR. */
|
|
|
|
|
|
else if (TREE_CODE (val) == NOP_EXPR
|
|
|
|
|
|
&& TREE_CODE (TREE_OPERAND (val, 0)) == INTEGER_CST
|
|
|
|
|
|
&& int_fits_type_p (TREE_OPERAND (val, 0), type))
|
|
|
|
|
|
;
|
1993-07-06 08:32:24 +02:00
|
|
|
|
/* If the value is extended from a narrower
|
|
|
|
|
|
unsigned type, it doesn't matter whether we
|
|
|
|
|
|
pass it as signed or unsigned; the value
|
|
|
|
|
|
certainly is the same either way. */
|
|
|
|
|
|
else if (TYPE_PRECISION (TREE_TYPE (val)) < TYPE_PRECISION (type)
|
builtins.c, [...]: Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* builtins.c, c-aux-info.c, c-common.c, c-cppbuiltin.c, c-decl.c:
Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* c-format.c, c-opts.c, c-pretty-print.c, c-typeck.c: Likewise.
* calls.c, convert.c, dbxout.c, dojump.c, dwarf2out.c: Likewise.
* expmed.c, expr.c, fold-const.c, function.c, integrate.c: Likewise.
* optabs.c, sdbout.c, stmt.c, stor-layout.c, tree-dump.c: Likewise.
* tree.c, config/iq2000/iq2000.c, config/m32r/m32r.c: Likewise.
* config/mips/mips.c, config/rs6000/rs6000.c: Likewise.
* config/s390/s390.c, config/sparc/sparc.c, objc/objc-act.c: Likewise.
* stor-layout.c (layout_type, case COMPLEX_TYPE): Test for
REAL_TYPE, not INTEGER_TYPE.
(layout_type, case VECTOR_TYPE): Simplify code.
* tree.c (build_vector_type_for_mode): Remove dup unsigned setting.
* tree.h: Update comments.
(STRIP_NOPS): Use TYPE_UNSIGNED.
(TYPE_UNSIGNED): New macro.
(TYPE_TRAP_SIGNED): Remove now redundant check.
(SAVE_EXPR_NOPLACEHOLDER): Don't use TREE_UNSIGNED.
* cp/call.c (joust): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* cp/class.c (check_bitfield_decl): Likewise.
* cp/cvt.c (type_promotes_to): Likewise.
* cp/decl.c (finish_enum): Likewise.
* cp/mangle.c (write_builtin_type): Likewise.
* cp/semantics.c (finish_switch_cond, finish_unary_op_expr): Likewise.
* cp/typeck.c (type_after_usual_arithmetic_conversions): Likewise.
(build_binary_op): Likewise.
* f/com.c (ffecom_arrayref_): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
(ffecom_expr_): Likewise.
* java/jcf-write.c (generate_bytecode_insns): Use TYPE_UNSIGNED.
* treelang/treetree.c (tree_lang_signed_or_unsigned_type):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/decl.c (gnat_to_gnu_entity, make_type_from_size):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/trans.c (tree_transform, convert_with_check): Likewise.
* ada/utils.c (gnat_signed_or_unsigned_type): Likewise.
(build_vms_descriptor, unchecked_convert): Likewise.
* ada/utils2.c (nonbinary_modular_operation): Likewise.
From-SVN: r80287
2004-04-01 05:50:43 +02:00
|
|
|
|
&& TYPE_UNSIGNED (TREE_TYPE (val)))
|
1993-07-06 08:32:24 +02:00
|
|
|
|
;
|
builtins.c, [...]: Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* builtins.c, c-aux-info.c, c-common.c, c-cppbuiltin.c, c-decl.c:
Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* c-format.c, c-opts.c, c-pretty-print.c, c-typeck.c: Likewise.
* calls.c, convert.c, dbxout.c, dojump.c, dwarf2out.c: Likewise.
* expmed.c, expr.c, fold-const.c, function.c, integrate.c: Likewise.
* optabs.c, sdbout.c, stmt.c, stor-layout.c, tree-dump.c: Likewise.
* tree.c, config/iq2000/iq2000.c, config/m32r/m32r.c: Likewise.
* config/mips/mips.c, config/rs6000/rs6000.c: Likewise.
* config/s390/s390.c, config/sparc/sparc.c, objc/objc-act.c: Likewise.
* stor-layout.c (layout_type, case COMPLEX_TYPE): Test for
REAL_TYPE, not INTEGER_TYPE.
(layout_type, case VECTOR_TYPE): Simplify code.
* tree.c (build_vector_type_for_mode): Remove dup unsigned setting.
* tree.h: Update comments.
(STRIP_NOPS): Use TYPE_UNSIGNED.
(TYPE_UNSIGNED): New macro.
(TYPE_TRAP_SIGNED): Remove now redundant check.
(SAVE_EXPR_NOPLACEHOLDER): Don't use TREE_UNSIGNED.
* cp/call.c (joust): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* cp/class.c (check_bitfield_decl): Likewise.
* cp/cvt.c (type_promotes_to): Likewise.
* cp/decl.c (finish_enum): Likewise.
* cp/mangle.c (write_builtin_type): Likewise.
* cp/semantics.c (finish_switch_cond, finish_unary_op_expr): Likewise.
* cp/typeck.c (type_after_usual_arithmetic_conversions): Likewise.
(build_binary_op): Likewise.
* f/com.c (ffecom_arrayref_): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
(ffecom_expr_): Likewise.
* java/jcf-write.c (generate_bytecode_insns): Use TYPE_UNSIGNED.
* treelang/treetree.c (tree_lang_signed_or_unsigned_type):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/decl.c (gnat_to_gnu_entity, make_type_from_size):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/trans.c (tree_transform, convert_with_check): Likewise.
* ada/utils.c (gnat_signed_or_unsigned_type): Likewise.
(build_vms_descriptor, unchecked_convert): Likewise.
* ada/utils2.c (nonbinary_modular_operation): Likewise.
From-SVN: r80287
2004-04-01 05:50:43 +02:00
|
|
|
|
else if (TYPE_UNSIGNED (type))
|
2001-04-17 04:21:10 +02:00
|
|
|
|
warn_for_assignment ("%s as unsigned due to prototype", (char *) 0, name, parmnum + 1);
|
|
|
|
|
|
else
|
|
|
|
|
|
warn_for_assignment ("%s as signed due to prototype", (char *) 0, name, parmnum + 1);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2003-06-22 15:41:26 +02:00
|
|
|
|
parmval = convert_for_assignment (type, val,
|
1996-07-04 00:07:53 +02:00
|
|
|
|
(char *) 0, /* arg passing */
|
1993-02-27 23:12:42 +01:00
|
|
|
|
fundecl, name, parmnum + 1);
|
2003-06-22 15:41:26 +02:00
|
|
|
|
|
targhooks.c: New file.
* targhooks.c: New file.
* targhooks.h: New file.
* Makefile.in: Add targhooks.o support.
(function.o): Depend on$(TARGET_H).
(stmt.o): Likewise.
(combine.o): Depend on $(TREE_H) and $(TARGET_H).
* builtins.c (apply_args_size, expand_builtin_apply_args_1,
expand_builtin_apply): Convert to calls.struct_value_rtx hook.
(expand_builtin_saveregs): Convert to
calls.expand_builtin_saveregs hook.
* c-decl.c (start_decl): Handle new calls.promote_prototypes hook
here, instead of ...
(get_parm_info) ... here.
(store_parm_decls_oldstyle): Convert to calls.promote_prototypes
hook.
(finish_function): Handle calls.promote_prototypes hook here too.
* c-typeck.c (convert_arguments): Convert to
calls.promote_prototypes hook.
(c_convert_parm_for_inlining): Likewise.
* calls.c (initialize_argument_information): Convert to
calls.promote_function_args hook.
(expand_call): Convert to calls.struct_value_rtx,
calls.strict_argument_naming,
calls.pretend_outgoing_varargs_named, and
calls.promote_function_return hooks. Pass fndecl to
aggregate_value_p. Initialize CUMULATIVE_ARGS before calling
hooks, so they can use that.
(emit_library_call_value_1): Likewise.
* combine.c (setup_incoming_promotions): Convert to
calls.promote_function_args hook.
* emit-rtl.c: Convert to calls.struct_value_rtx hook.
* expr.c (expand_assignment): Pass call to aggregate_value_p.
(expand_expr): Likewise.
* expr.h: Remove support for SETUP_INCOMING_VARARGS,
STRICT_ARGUMENT_NAMING, PRETEND_OUTGOING_VARARGS_NAMED,
RETURN_IN_MEMORY macro defaults.
* final.c (profile_function): Convert to calls.struct_value_rtx
hook.
* function.c (aggregate_value_p): Accept function type tree as
second parameter; try to deduce fntype from it. Convert to
calls.return_in_memory hook.
(assign_parms): Convert to calls.setup_incoming_varargs,
calls.strict_argument_naming, calls.promote_function_args,
calls.pretend_outgoing_varargs_named hooks. Pass fndecl to
aggregate_value_p.
(expand_function_start): Likewise. Convert to
calls.struct_value_rtx hook.
(expand_function_end): Convert to calls.promote_function_return hook.
(allocate_struct_function): Pass fndecl to aggregate_value_p.
* hard-reg-set.h: Update comments to new hook names.
* integrate.c (expand_inline_function): Pass fndecl to aggregate_value_p.
* reg-stack.c (stack_result): Likewise.
* rtl.h (struct_value_rtx, struct_value_incoming_rtx): Delete.
* stmt.c (expand_value_return): Convert to
calls.promote_function_return hook.
* target-def.h: Add TARGET_PROMOTE_FUNCTION_ARGS,
TARGET_PROMOTE_FUNCTION_RETURN, TARGET_PROMOTE_PROTOTYPES,
TARGET_STRUCT_VALUE_RTX, TARGET_RETURN_IN_MEMORY,
TARGET_EXPAND_BUILTIN_SAVEREGS, TARGET_SETUP_INCOMING_VARARGS,
TARGET_STRICT_ARGUMENT_NAMING,
TARGET_PRETEND_OUTGOING_VARARGS_NAMED, and TARGET_CALLS.
* target.h: Likewise.
* tree.h (aggregate_value_p): Also takes a tree to deduce function
attributes from (for target hooks).
* doc/tm.texi (PROMOTE_FUNCTION_ARGS, PROMOTE_FUNCTION_RETURN,
PROMOTE_PROTOTYPES, RETURN_IN_MEMORY, STRUCT_VALUE_REGNUM,
STRUCT_VALUE, STRUCT_VALUE_INCOMING_REGNUM, STRUCT_VALUE_INCOMING,
EXPAND_BUILTIN_SAVEREGS, SETUP_INCOMING_VARARGS,
STRICT_ARGUMENT_NAMING, PRETEND_OUTGOING_VARARGS_NAMED): Convert
to hooks.
* config/alpha/alpha.c (alpha_output_mi_thunk_osf): Pass function
to aggregate_value_p.
* config/arm/arm.c (arm_init_cumulative_args,
arm_output_mi_thunk): Likewise.
* config/i386/i386.c (ix86_return_pops_args, x86_this_parameter):
Likewise.
* config/mips/mips.c (mips_save_reg_p, mips_expand_prologue,
mips_can_use_return_insn): Likewise.
* config/rs6000/rs6000.c (rs6000_output_mi_thunk): Likewise.
* config/s390/s390.c (s390_output_mi_thunk): Likewise.
* config/sparc/sparc.c (sparc_output_mi_thunk): Pass function to
aggregate_value_p.
* config/story16/stormy16.c (xstormy16_asm_output_mi_thunk): Pass
function to aggregate_value_p.
* objc/objc-act.c (generate_struct_by_value_array): Pass NULL to
aggregate_value_p.
* config/sh/sh-protos.h (sh_builtin_saveregs): Remove.
(sh_attr_renesas_p, sh_cfun_attr_renesas_p, sh_function_arg,
sh_function_arg_advance, sh_pass_in_reg_p): New. * config/sh/sh.c
(sh_handle_renesas_attribute, sh_promote_prototypes,
sh_struct_value_rtx, sh_return_in_memory, sh_builtin_saveregs,
sh_setup_incoming_varargs, sh_strict_argument_naming,
sh_pretend_outgoing_varargs_named): New decls.
(targetm): Add new hooks.
(calc_live_regs): Save MACL and MACH if the function has the
renesas attribute.
(sh_expand_prologue): Support renesas attribute.
(sh_builtin_saveregs): Make static.
(sh_build_va_list): Support renesas attribute.
(sh_va_start): Likewise.
(sh_va_arg): Likewise.
(sh_promote_prototypes): New.
(sh_function_arg): New, moved from sh.h. Support renesas
attribute.
(sh_function_arg_advance): Likewise.
(sh_return_in_memory): Likewise.
(sh_strict_argument_naming): Likewise.
(sh_pretend_outgoing_varargs_named): Likewise.
(sh_struct_value_rtx): New.
(sh_attribute): Add renesas attribute.
(sh_handle_renesas_attribute): New.
(sh_attr_renesas_p, sh_cfun_attr_renesas_p): New.
(sh_ms_bitfield_layout_p): Support renesas attribute also.
(sh_output_mi_thunk): Pass function to aggregate_value_p. *
config/sh/sh.h (TARGET_SWITCHES): Add -mrenesas as an alias for
-mhitachi.
(STRUCT_VALUE_REGNUM, STRUCT_VALUE, RETURN_IN_MEMORY): Moved to
target hooks.
(sh_args): Add renesas_abi flag.
(INIT_CUMULATIVE_ARGS): Set it. Pass fndecl to aggregate_value_p.
(FUNCTION_ARG_ADVANCE, FUNCTION_ARG): Move to sh.c.
(PASS_IN_REG_P): Support renesas attribute. Pass DF and TF on the
stack for the renesas abi.
(STRICT_ARGUMENT_NAMING, PRETEND_OUTGOING_VARARGS_NAMED,
SETUP_INCOMING_VARARGS, EXPAND_BUILTIN_SAVEREGS,
PROMOTE_PROTOTYPES): Moved to sh.c. * config/sh/sh.md (call): Set
call cookie to indicate renesas calls.
* decl.c (finish_function): Pass fndecl to aggregate_value_p.
* misc.c (default_pass_by_ref): Convert to calls.return_in_memory
hook.
From-SVN: r71048
2003-09-04 05:18:05 +02:00
|
|
|
|
if (targetm.calls.promote_prototypes (fundecl ? TREE_TYPE (fundecl) : 0)
|
2001-06-04 22:26:16 +02:00
|
|
|
|
&& INTEGRAL_TYPE_P (type)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
&& (TYPE_PRECISION (type) < TYPE_PRECISION (integer_type_node)))
|
|
|
|
|
|
parmval = default_conversion (parmval);
|
|
|
|
|
|
}
|
1992-07-07 00:35:53 +02:00
|
|
|
|
result = tree_cons (NULL_TREE, parmval, result);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
|
|
|
|
|
else if (TREE_CODE (TREE_TYPE (val)) == REAL_TYPE
|
|
|
|
|
|
&& (TYPE_PRECISION (TREE_TYPE (val))
|
|
|
|
|
|
< TYPE_PRECISION (double_type_node)))
|
|
|
|
|
|
/* Convert `float' to `double'. */
|
|
|
|
|
|
result = tree_cons (NULL_TREE, convert (double_type_node, val), result);
|
|
|
|
|
|
else
|
|
|
|
|
|
/* Convert `short' and `char' to full-size `int'. */
|
|
|
|
|
|
result = tree_cons (NULL_TREE, default_conversion (val), result);
|
|
|
|
|
|
|
|
|
|
|
|
if (typetail)
|
|
|
|
|
|
typetail = TREE_CHAIN (typetail);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (typetail != 0 && TREE_VALUE (typetail) != void_type_node)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (name)
|
|
|
|
|
|
error ("too few arguments to function `%s'",
|
|
|
|
|
|
IDENTIFIER_POINTER (name));
|
|
|
|
|
|
else
|
|
|
|
|
|
error ("too few arguments to function");
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return nreverse (result);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* This is the entry point used by the parser
|
|
|
|
|
|
for binary operators in the input.
|
|
|
|
|
|
In addition to constructing the expression,
|
|
|
|
|
|
we check for operands that were written with other binary operators
|
|
|
|
|
|
in a way that is likely to confuse the user. */
|
1992-08-21 08:05:17 +02:00
|
|
|
|
|
c-tree.h (struct c_expr): Define.
* c-tree.h (struct c_expr): Define.
(C_SET_EXP_ORIGINAL_CODE): Remove.
(parser_build_binary_op, build_compound_expr): Update prototypes.
* c-parse.in (%union): Add exprtype.
(FUNC_NAME): Mark as ttype.
(expr, expr_no_commas, cast_expr, unary_expr, primary): Change to
exprtype.
(expr): Update. Define directly in terms of expr_no_commas
instead of using nonnull_exprlist.
(nonnull_exprlist, unary_expr, cast_expr, expr_no_commas, primary,
offsetof_member_designator, typespec_nonreserved_nonattr, init,
initval, designator, component_declarator,
component_notype_declarator, enumerator, array_declarator,
condition, exexpr, switch_statement, stmt_nocomp, stmt,
nonnull_asm_operands, ivar_declarator, receiver): Update. Don't
set C_EXP_ORIGINAL_CODE. Use TREE_NO_WARNING for assignments
where appropriate.
* c-common.h (C_EXP_ORIGINAL_CODE): Remove.
* c-common.c (c_common_truthvalue_conversion): Don't check
C_EXP_ORIGINAL_CODE.
* c-typeck.c (parser_build_binary_op): Use c_expr structures.
Don't use C_EXP_ORIGINAL_CODE.
(default_conversion, default_function_array_conversion): Don't use
C_EXP_ORIGINAL_CODE. Preserve TREE_NO_WARNING.
(internal_build_compound_expr): Merge into build_compound_expr.
(build_compound_expr): Take two operands instead of a TREE_LIST.
* objc/objc-act.c (get_super_receiver): Update calls to
build_compound_expr.
cp:
* typeck.c (build_modify_expr, build_x_modify_expr): Set
TREE_NO_WARNING on assignments with an operator other than '='.
testsuite:
* g++.dg/warn/Wparentheses-1.C, g++.dg/warn/Wparentheses-2.C,
gcc.dg/Wparentheses-10.c: New tests.
* gcc.dg/Wparentheses-5.c: Remove XFAILs.
From-SVN: r84911
2004-07-19 10:38:52 +02:00
|
|
|
|
struct c_expr
|
|
|
|
|
|
parser_build_binary_op (enum tree_code code, struct c_expr arg1,
|
|
|
|
|
|
struct c_expr arg2)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
c-tree.h (struct c_expr): Define.
* c-tree.h (struct c_expr): Define.
(C_SET_EXP_ORIGINAL_CODE): Remove.
(parser_build_binary_op, build_compound_expr): Update prototypes.
* c-parse.in (%union): Add exprtype.
(FUNC_NAME): Mark as ttype.
(expr, expr_no_commas, cast_expr, unary_expr, primary): Change to
exprtype.
(expr): Update. Define directly in terms of expr_no_commas
instead of using nonnull_exprlist.
(nonnull_exprlist, unary_expr, cast_expr, expr_no_commas, primary,
offsetof_member_designator, typespec_nonreserved_nonattr, init,
initval, designator, component_declarator,
component_notype_declarator, enumerator, array_declarator,
condition, exexpr, switch_statement, stmt_nocomp, stmt,
nonnull_asm_operands, ivar_declarator, receiver): Update. Don't
set C_EXP_ORIGINAL_CODE. Use TREE_NO_WARNING for assignments
where appropriate.
* c-common.h (C_EXP_ORIGINAL_CODE): Remove.
* c-common.c (c_common_truthvalue_conversion): Don't check
C_EXP_ORIGINAL_CODE.
* c-typeck.c (parser_build_binary_op): Use c_expr structures.
Don't use C_EXP_ORIGINAL_CODE.
(default_conversion, default_function_array_conversion): Don't use
C_EXP_ORIGINAL_CODE. Preserve TREE_NO_WARNING.
(internal_build_compound_expr): Merge into build_compound_expr.
(build_compound_expr): Take two operands instead of a TREE_LIST.
* objc/objc-act.c (get_super_receiver): Update calls to
build_compound_expr.
cp:
* typeck.c (build_modify_expr, build_x_modify_expr): Set
TREE_NO_WARNING on assignments with an operator other than '='.
testsuite:
* g++.dg/warn/Wparentheses-1.C, g++.dg/warn/Wparentheses-2.C,
gcc.dg/Wparentheses-10.c: New tests.
* gcc.dg/Wparentheses-5.c: Remove XFAILs.
From-SVN: r84911
2004-07-19 10:38:52 +02:00
|
|
|
|
struct c_expr result;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
c-tree.h (struct c_expr): Define.
* c-tree.h (struct c_expr): Define.
(C_SET_EXP_ORIGINAL_CODE): Remove.
(parser_build_binary_op, build_compound_expr): Update prototypes.
* c-parse.in (%union): Add exprtype.
(FUNC_NAME): Mark as ttype.
(expr, expr_no_commas, cast_expr, unary_expr, primary): Change to
exprtype.
(expr): Update. Define directly in terms of expr_no_commas
instead of using nonnull_exprlist.
(nonnull_exprlist, unary_expr, cast_expr, expr_no_commas, primary,
offsetof_member_designator, typespec_nonreserved_nonattr, init,
initval, designator, component_declarator,
component_notype_declarator, enumerator, array_declarator,
condition, exexpr, switch_statement, stmt_nocomp, stmt,
nonnull_asm_operands, ivar_declarator, receiver): Update. Don't
set C_EXP_ORIGINAL_CODE. Use TREE_NO_WARNING for assignments
where appropriate.
* c-common.h (C_EXP_ORIGINAL_CODE): Remove.
* c-common.c (c_common_truthvalue_conversion): Don't check
C_EXP_ORIGINAL_CODE.
* c-typeck.c (parser_build_binary_op): Use c_expr structures.
Don't use C_EXP_ORIGINAL_CODE.
(default_conversion, default_function_array_conversion): Don't use
C_EXP_ORIGINAL_CODE. Preserve TREE_NO_WARNING.
(internal_build_compound_expr): Merge into build_compound_expr.
(build_compound_expr): Take two operands instead of a TREE_LIST.
* objc/objc-act.c (get_super_receiver): Update calls to
build_compound_expr.
cp:
* typeck.c (build_modify_expr, build_x_modify_expr): Set
TREE_NO_WARNING on assignments with an operator other than '='.
testsuite:
* g++.dg/warn/Wparentheses-1.C, g++.dg/warn/Wparentheses-2.C,
gcc.dg/Wparentheses-10.c: New tests.
* gcc.dg/Wparentheses-5.c: Remove XFAILs.
From-SVN: r84911
2004-07-19 10:38:52 +02:00
|
|
|
|
enum tree_code code1 = arg1.original_code;
|
|
|
|
|
|
enum tree_code code2 = arg2.original_code;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
c-tree.h (struct c_expr): Define.
* c-tree.h (struct c_expr): Define.
(C_SET_EXP_ORIGINAL_CODE): Remove.
(parser_build_binary_op, build_compound_expr): Update prototypes.
* c-parse.in (%union): Add exprtype.
(FUNC_NAME): Mark as ttype.
(expr, expr_no_commas, cast_expr, unary_expr, primary): Change to
exprtype.
(expr): Update. Define directly in terms of expr_no_commas
instead of using nonnull_exprlist.
(nonnull_exprlist, unary_expr, cast_expr, expr_no_commas, primary,
offsetof_member_designator, typespec_nonreserved_nonattr, init,
initval, designator, component_declarator,
component_notype_declarator, enumerator, array_declarator,
condition, exexpr, switch_statement, stmt_nocomp, stmt,
nonnull_asm_operands, ivar_declarator, receiver): Update. Don't
set C_EXP_ORIGINAL_CODE. Use TREE_NO_WARNING for assignments
where appropriate.
* c-common.h (C_EXP_ORIGINAL_CODE): Remove.
* c-common.c (c_common_truthvalue_conversion): Don't check
C_EXP_ORIGINAL_CODE.
* c-typeck.c (parser_build_binary_op): Use c_expr structures.
Don't use C_EXP_ORIGINAL_CODE.
(default_conversion, default_function_array_conversion): Don't use
C_EXP_ORIGINAL_CODE. Preserve TREE_NO_WARNING.
(internal_build_compound_expr): Merge into build_compound_expr.
(build_compound_expr): Take two operands instead of a TREE_LIST.
* objc/objc-act.c (get_super_receiver): Update calls to
build_compound_expr.
cp:
* typeck.c (build_modify_expr, build_x_modify_expr): Set
TREE_NO_WARNING on assignments with an operator other than '='.
testsuite:
* g++.dg/warn/Wparentheses-1.C, g++.dg/warn/Wparentheses-2.C,
gcc.dg/Wparentheses-10.c: New tests.
* gcc.dg/Wparentheses-5.c: Remove XFAILs.
From-SVN: r84911
2004-07-19 10:38:52 +02:00
|
|
|
|
result.value = build_binary_op (code, arg1.value, arg2.value, 1);
|
|
|
|
|
|
result.original_code = code;
|
2002-01-22 08:48:25 +01:00
|
|
|
|
|
c-tree.h (struct c_expr): Define.
* c-tree.h (struct c_expr): Define.
(C_SET_EXP_ORIGINAL_CODE): Remove.
(parser_build_binary_op, build_compound_expr): Update prototypes.
* c-parse.in (%union): Add exprtype.
(FUNC_NAME): Mark as ttype.
(expr, expr_no_commas, cast_expr, unary_expr, primary): Change to
exprtype.
(expr): Update. Define directly in terms of expr_no_commas
instead of using nonnull_exprlist.
(nonnull_exprlist, unary_expr, cast_expr, expr_no_commas, primary,
offsetof_member_designator, typespec_nonreserved_nonattr, init,
initval, designator, component_declarator,
component_notype_declarator, enumerator, array_declarator,
condition, exexpr, switch_statement, stmt_nocomp, stmt,
nonnull_asm_operands, ivar_declarator, receiver): Update. Don't
set C_EXP_ORIGINAL_CODE. Use TREE_NO_WARNING for assignments
where appropriate.
* c-common.h (C_EXP_ORIGINAL_CODE): Remove.
* c-common.c (c_common_truthvalue_conversion): Don't check
C_EXP_ORIGINAL_CODE.
* c-typeck.c (parser_build_binary_op): Use c_expr structures.
Don't use C_EXP_ORIGINAL_CODE.
(default_conversion, default_function_array_conversion): Don't use
C_EXP_ORIGINAL_CODE. Preserve TREE_NO_WARNING.
(internal_build_compound_expr): Merge into build_compound_expr.
(build_compound_expr): Take two operands instead of a TREE_LIST.
* objc/objc-act.c (get_super_receiver): Update calls to
build_compound_expr.
cp:
* typeck.c (build_modify_expr, build_x_modify_expr): Set
TREE_NO_WARNING on assignments with an operator other than '='.
testsuite:
* g++.dg/warn/Wparentheses-1.C, g++.dg/warn/Wparentheses-2.C,
gcc.dg/Wparentheses-10.c: New tests.
* gcc.dg/Wparentheses-5.c: Remove XFAILs.
From-SVN: r84911
2004-07-19 10:38:52 +02:00
|
|
|
|
if (TREE_CODE (result.value) == ERROR_MARK)
|
|
|
|
|
|
return result;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
|
|
|
|
|
/* Check for cases such as x+y<<z which users are likely
|
c-tree.h (struct c_expr): Define.
* c-tree.h (struct c_expr): Define.
(C_SET_EXP_ORIGINAL_CODE): Remove.
(parser_build_binary_op, build_compound_expr): Update prototypes.
* c-parse.in (%union): Add exprtype.
(FUNC_NAME): Mark as ttype.
(expr, expr_no_commas, cast_expr, unary_expr, primary): Change to
exprtype.
(expr): Update. Define directly in terms of expr_no_commas
instead of using nonnull_exprlist.
(nonnull_exprlist, unary_expr, cast_expr, expr_no_commas, primary,
offsetof_member_designator, typespec_nonreserved_nonattr, init,
initval, designator, component_declarator,
component_notype_declarator, enumerator, array_declarator,
condition, exexpr, switch_statement, stmt_nocomp, stmt,
nonnull_asm_operands, ivar_declarator, receiver): Update. Don't
set C_EXP_ORIGINAL_CODE. Use TREE_NO_WARNING for assignments
where appropriate.
* c-common.h (C_EXP_ORIGINAL_CODE): Remove.
* c-common.c (c_common_truthvalue_conversion): Don't check
C_EXP_ORIGINAL_CODE.
* c-typeck.c (parser_build_binary_op): Use c_expr structures.
Don't use C_EXP_ORIGINAL_CODE.
(default_conversion, default_function_array_conversion): Don't use
C_EXP_ORIGINAL_CODE. Preserve TREE_NO_WARNING.
(internal_build_compound_expr): Merge into build_compound_expr.
(build_compound_expr): Take two operands instead of a TREE_LIST.
* objc/objc-act.c (get_super_receiver): Update calls to
build_compound_expr.
cp:
* typeck.c (build_modify_expr, build_x_modify_expr): Set
TREE_NO_WARNING on assignments with an operator other than '='.
testsuite:
* g++.dg/warn/Wparentheses-1.C, g++.dg/warn/Wparentheses-2.C,
gcc.dg/Wparentheses-10.c: New tests.
* gcc.dg/Wparentheses-5.c: Remove XFAILs.
From-SVN: r84911
2004-07-19 10:38:52 +02:00
|
|
|
|
to misinterpret. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
if (warn_parentheses)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (code == LSHIFT_EXPR || code == RSHIFT_EXPR)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (code1 == PLUS_EXPR || code1 == MINUS_EXPR
|
|
|
|
|
|
|| code2 == PLUS_EXPR || code2 == MINUS_EXPR)
|
|
|
|
|
|
warning ("suggest parentheses around + or - inside shift");
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (code == TRUTH_ORIF_EXPR)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (code1 == TRUTH_ANDIF_EXPR
|
|
|
|
|
|
|| code2 == TRUTH_ANDIF_EXPR)
|
|
|
|
|
|
warning ("suggest parentheses around && within ||");
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (code == BIT_IOR_EXPR)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (code1 == BIT_AND_EXPR || code1 == BIT_XOR_EXPR
|
|
|
|
|
|
|| code1 == PLUS_EXPR || code1 == MINUS_EXPR
|
|
|
|
|
|
|| code2 == BIT_AND_EXPR || code2 == BIT_XOR_EXPR
|
|
|
|
|
|
|| code2 == PLUS_EXPR || code2 == MINUS_EXPR)
|
|
|
|
|
|
warning ("suggest parentheses around arithmetic in operand of |");
|
1995-10-18 22:56:23 +01:00
|
|
|
|
/* Check cases like x|y==z */
|
|
|
|
|
|
if (TREE_CODE_CLASS (code1) == '<' || TREE_CODE_CLASS (code2) == '<')
|
|
|
|
|
|
warning ("suggest parentheses around comparison in operand of |");
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (code == BIT_XOR_EXPR)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (code1 == BIT_AND_EXPR
|
|
|
|
|
|
|| code1 == PLUS_EXPR || code1 == MINUS_EXPR
|
|
|
|
|
|
|| code2 == BIT_AND_EXPR
|
|
|
|
|
|
|| code2 == PLUS_EXPR || code2 == MINUS_EXPR)
|
|
|
|
|
|
warning ("suggest parentheses around arithmetic in operand of ^");
|
1995-10-18 22:56:23 +01:00
|
|
|
|
/* Check cases like x^y==z */
|
|
|
|
|
|
if (TREE_CODE_CLASS (code1) == '<' || TREE_CODE_CLASS (code2) == '<')
|
|
|
|
|
|
warning ("suggest parentheses around comparison in operand of ^");
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (code == BIT_AND_EXPR)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (code1 == PLUS_EXPR || code1 == MINUS_EXPR
|
|
|
|
|
|
|| code2 == PLUS_EXPR || code2 == MINUS_EXPR)
|
|
|
|
|
|
warning ("suggest parentheses around + or - in operand of &");
|
1995-10-18 22:56:23 +01:00
|
|
|
|
/* Check cases like x&y==z */
|
|
|
|
|
|
if (TREE_CODE_CLASS (code1) == '<' || TREE_CODE_CLASS (code2) == '<')
|
|
|
|
|
|
warning ("suggest parentheses around comparison in operand of &");
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
2004-07-17 11:20:51 +02:00
|
|
|
|
/* Similarly, check for cases like 1<=i<=10 that are probably errors. */
|
|
|
|
|
|
if (TREE_CODE_CLASS (code) == '<'
|
|
|
|
|
|
&& (TREE_CODE_CLASS (code1) == '<'
|
|
|
|
|
|
|| TREE_CODE_CLASS (code2) == '<'))
|
|
|
|
|
|
warning ("comparisons like X<=Y<=Z do not have their mathematical meaning");
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2004-07-17 11:20:51 +02:00
|
|
|
|
}
|
1992-08-11 11:21:37 +02:00
|
|
|
|
|
c-tree.h (struct c_expr): Define.
* c-tree.h (struct c_expr): Define.
(C_SET_EXP_ORIGINAL_CODE): Remove.
(parser_build_binary_op, build_compound_expr): Update prototypes.
* c-parse.in (%union): Add exprtype.
(FUNC_NAME): Mark as ttype.
(expr, expr_no_commas, cast_expr, unary_expr, primary): Change to
exprtype.
(expr): Update. Define directly in terms of expr_no_commas
instead of using nonnull_exprlist.
(nonnull_exprlist, unary_expr, cast_expr, expr_no_commas, primary,
offsetof_member_designator, typespec_nonreserved_nonattr, init,
initval, designator, component_declarator,
component_notype_declarator, enumerator, array_declarator,
condition, exexpr, switch_statement, stmt_nocomp, stmt,
nonnull_asm_operands, ivar_declarator, receiver): Update. Don't
set C_EXP_ORIGINAL_CODE. Use TREE_NO_WARNING for assignments
where appropriate.
* c-common.h (C_EXP_ORIGINAL_CODE): Remove.
* c-common.c (c_common_truthvalue_conversion): Don't check
C_EXP_ORIGINAL_CODE.
* c-typeck.c (parser_build_binary_op): Use c_expr structures.
Don't use C_EXP_ORIGINAL_CODE.
(default_conversion, default_function_array_conversion): Don't use
C_EXP_ORIGINAL_CODE. Preserve TREE_NO_WARNING.
(internal_build_compound_expr): Merge into build_compound_expr.
(build_compound_expr): Take two operands instead of a TREE_LIST.
* objc/objc-act.c (get_super_receiver): Update calls to
build_compound_expr.
cp:
* typeck.c (build_modify_expr, build_x_modify_expr): Set
TREE_NO_WARNING on assignments with an operator other than '='.
testsuite:
* g++.dg/warn/Wparentheses-1.C, g++.dg/warn/Wparentheses-2.C,
gcc.dg/Wparentheses-10.c: New tests.
* gcc.dg/Wparentheses-5.c: Remove XFAILs.
From-SVN: r84911
2004-07-19 10:38:52 +02:00
|
|
|
|
unsigned_conversion_warning (result.value, arg1.value);
|
|
|
|
|
|
unsigned_conversion_warning (result.value, arg2.value);
|
|
|
|
|
|
overflow_warning (result.value);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
|
|
|
|
|
return result;
|
|
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
|
|
|
|
|
|
/* Return a tree for the difference of pointers OP0 and OP1.
|
|
|
|
|
|
The resulting tree has type int. */
|
1995-04-01 22:18:49 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
static tree
|
|
|
|
|
|
pointer_diff (tree op0, tree op1)
|
|
|
|
|
|
{
|
|
|
|
|
|
tree restype = ptrdiff_type_node;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
tree target_type = TREE_TYPE (TREE_TYPE (op0));
|
|
|
|
|
|
tree con0, con1, lit0, lit1;
|
|
|
|
|
|
tree orig_op1 = op1;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (pedantic || warn_pointer_arith)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (TREE_CODE (target_type) == VOID_TYPE)
|
|
|
|
|
|
pedwarn ("pointer of type `void *' used in subtraction");
|
|
|
|
|
|
if (TREE_CODE (target_type) == FUNCTION_TYPE)
|
|
|
|
|
|
pedwarn ("pointer to a function used in subtraction");
|
|
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* If the conversion to ptrdiff_type does anything like widening or
|
|
|
|
|
|
converting a partial to an integral mode, we get a convert_expression
|
|
|
|
|
|
that is in the way to do any simplifications.
|
|
|
|
|
|
(fold-const.c doesn't know that the extra bits won't be needed.
|
|
|
|
|
|
split_tree uses STRIP_SIGN_NOPS, which leaves conversions to a
|
|
|
|
|
|
different mode in place.)
|
|
|
|
|
|
So first try to find a common term here 'by hand'; we want to cover
|
|
|
|
|
|
at least the cases that occur in legal static initializers. */
|
|
|
|
|
|
con0 = TREE_CODE (op0) == NOP_EXPR ? TREE_OPERAND (op0, 0) : op0;
|
|
|
|
|
|
con1 = TREE_CODE (op1) == NOP_EXPR ? TREE_OPERAND (op1, 0) : op1;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (TREE_CODE (con0) == PLUS_EXPR)
|
|
|
|
|
|
{
|
|
|
|
|
|
lit0 = TREE_OPERAND (con0, 1);
|
|
|
|
|
|
con0 = TREE_OPERAND (con0, 0);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
lit0 = integer_zero_node;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (TREE_CODE (con1) == PLUS_EXPR)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
lit1 = TREE_OPERAND (con1, 1);
|
|
|
|
|
|
con1 = TREE_OPERAND (con1, 0);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
|
|
|
|
|
else
|
2003-07-18 02:26:51 +02:00
|
|
|
|
lit1 = integer_zero_node;
|
|
|
|
|
|
|
|
|
|
|
|
if (operand_equal_p (con0, con1, 0))
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
op0 = lit0;
|
|
|
|
|
|
op1 = lit1;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* First do the subtraction as integers;
|
|
|
|
|
|
then drop through to build the divide operator.
|
|
|
|
|
|
Do not do default conversions on the minus operator
|
|
|
|
|
|
in case restype is a short type. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
op0 = build_binary_op (MINUS_EXPR, convert (restype, op0),
|
|
|
|
|
|
convert (restype, op1), 0);
|
|
|
|
|
|
/* This generates an error if op1 is pointer to incomplete type. */
|
|
|
|
|
|
if (!COMPLETE_OR_VOID_TYPE_P (TREE_TYPE (TREE_TYPE (orig_op1))))
|
|
|
|
|
|
error ("arithmetic on pointer to an incomplete type");
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* This generates an error if op0 is pointer to incomplete type. */
|
|
|
|
|
|
op1 = c_size_in_bytes (target_type);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Divide by the size, in easiest possible way. */
|
2004-05-13 08:41:07 +02:00
|
|
|
|
return fold (build (EXACT_DIV_EXPR, restype, op0, convert (restype, op1)));
|
2003-07-18 02:26:51 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Construct and perhaps optimize a tree representation
|
|
|
|
|
|
for a unary operation. CODE, a tree_code, specifies the operation
|
|
|
|
|
|
and XARG is the operand.
|
|
|
|
|
|
For any CODE other than ADDR_EXPR, FLAG nonzero suppresses
|
|
|
|
|
|
the default promotions (such as from short to int).
|
|
|
|
|
|
For ADDR_EXPR, the default promotions are not applied; FLAG nonzero
|
|
|
|
|
|
allows non-lvalues; this is only used to handle conversion of non-lvalue
|
|
|
|
|
|
arrays to pointers in C99. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
tree
|
|
|
|
|
|
build_unary_op (enum tree_code code, tree xarg, int flag)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* No default_conversion here. It causes trouble for ADDR_EXPR. */
|
|
|
|
|
|
tree arg = xarg;
|
|
|
|
|
|
tree argtype = 0;
|
|
|
|
|
|
enum tree_code typecode = TREE_CODE (TREE_TYPE (arg));
|
|
|
|
|
|
tree val;
|
|
|
|
|
|
int noconvert = flag;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (typecode == ERROR_MARK)
|
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
if (typecode == ENUMERAL_TYPE || typecode == BOOLEAN_TYPE)
|
|
|
|
|
|
typecode = INTEGER_TYPE;
|
2001-10-23 20:14:31 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
switch (code)
|
|
|
|
|
|
{
|
|
|
|
|
|
case CONVERT_EXPR:
|
|
|
|
|
|
/* This is used for unary plus, because a CONVERT_EXPR
|
|
|
|
|
|
is enough to prevent anybody from looking inside for
|
|
|
|
|
|
associativity, but won't generate any code. */
|
|
|
|
|
|
if (!(typecode == INTEGER_TYPE || typecode == REAL_TYPE
|
2004-07-10 01:20:36 +02:00
|
|
|
|
|| typecode == COMPLEX_TYPE
|
|
|
|
|
|
|| typecode == VECTOR_TYPE))
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
error ("wrong type argument to unary plus");
|
|
|
|
|
|
return error_mark_node;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else if (!noconvert)
|
|
|
|
|
|
arg = default_conversion (arg);
|
|
|
|
|
|
arg = non_lvalue (arg);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
break;
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
case NEGATE_EXPR:
|
|
|
|
|
|
if (!(typecode == INTEGER_TYPE || typecode == REAL_TYPE
|
|
|
|
|
|
|| typecode == COMPLEX_TYPE
|
|
|
|
|
|
|| typecode == VECTOR_TYPE))
|
|
|
|
|
|
{
|
|
|
|
|
|
error ("wrong type argument to unary minus");
|
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (!noconvert)
|
|
|
|
|
|
arg = default_conversion (arg);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
break;
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
case BIT_NOT_EXPR:
|
|
|
|
|
|
if (typecode == INTEGER_TYPE || typecode == VECTOR_TYPE)
|
1993-10-26 18:00:09 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (!noconvert)
|
|
|
|
|
|
arg = default_conversion (arg);
|
1993-10-26 18:00:09 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else if (typecode == COMPLEX_TYPE)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
code = CONJ_EXPR;
|
|
|
|
|
|
if (pedantic)
|
|
|
|
|
|
pedwarn ("ISO C does not support `~' for complex conjugation");
|
|
|
|
|
|
if (!noconvert)
|
|
|
|
|
|
arg = default_conversion (arg);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
error ("wrong type argument to bit-complement");
|
|
|
|
|
|
return error_mark_node;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
case ABS_EXPR:
|
2003-08-12 03:45:23 +02:00
|
|
|
|
if (!(typecode == INTEGER_TYPE || typecode == REAL_TYPE))
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
error ("wrong type argument to abs");
|
|
|
|
|
|
return error_mark_node;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else if (!noconvert)
|
|
|
|
|
|
arg = default_conversion (arg);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
break;
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
case CONJ_EXPR:
|
|
|
|
|
|
/* Conjugating a real value is a no-op, but allow it anyway. */
|
|
|
|
|
|
if (!(typecode == INTEGER_TYPE || typecode == REAL_TYPE
|
|
|
|
|
|
|| typecode == COMPLEX_TYPE))
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
error ("wrong type argument to conjugation");
|
|
|
|
|
|
return error_mark_node;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else if (!noconvert)
|
|
|
|
|
|
arg = default_conversion (arg);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
break;
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
case TRUTH_NOT_EXPR:
|
|
|
|
|
|
if (typecode != INTEGER_TYPE
|
|
|
|
|
|
&& typecode != REAL_TYPE && typecode != POINTER_TYPE
|
|
|
|
|
|
&& typecode != COMPLEX_TYPE
|
|
|
|
|
|
/* These will convert to a pointer. */
|
|
|
|
|
|
&& typecode != ARRAY_TYPE && typecode != FUNCTION_TYPE)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
error ("wrong type argument to unary exclamation mark");
|
|
|
|
|
|
return error_mark_node;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
alias.c (get_alias_set): Replace calls via (*lang_hooks.foo) () with lang_hooks.foo ().
* alias.c (get_alias_set): Replace calls via (*lang_hooks.foo) ()
with lang_hooks.foo ().
* builtins.c (expand_builtin_va_arg): Likewise.
* c-common.c (fname_as_string, c_common_truthvalue_conversion,
c_common_type_for_mode, c_common_nodes_and_builtins,
handle_mode_attribute, handle_vector_size_attribute): Likewise.
* c-convert.c (convert): Likewise.
* c-format.c (check_format_types): Likewise.
* c-objc-common.c (c_tree_printer): Likewise.
* c-typeck.c (build_unary_op, build_conditional_expr,
build_binary_op): Likewise.
* calls.c (try_to_integrate, expand_call,
emit_library_call_value_1): Likewise.
* cgraph.c (cgraph_node_name, cgraph_function_possibly_inlined_p):
Likewise.
* cgraphunit.c (record_call_1, cgraph_analyze_function,
cgraph_expand_function): Likewise.
* convert.c (convert_to_pointer, convert_to_integer): Likewise.
* coverage.c (build_fn_info_type, build_ctr_info_type,
build_gcov_info, create_coverage): Likewise.
* dbxout.c (dbxout_init): Likewise.
* diagnostic.c (diagnostic_report_current_function): Likewise.
* dojump.c (do_jump): Likewise.
* dwarf2out.c (dwarf2_name): Likewise.
* except.c (init_eh): Likewise.
* explow.c (expr_size, int_expr_size): Likewise.
* expmed.c (make_tree, const_mult_add_overflow_p, expand_mult_add):
Likewise.
* expr.c (store_expr, store_constructor, safe_from_p,
expand_expr_real, do_store_flag, try_casesi): Likewise.
* function.c (push_function_context_to, pop_function_context_from,
free_after_parsing, assign_stack_local_1, assign_stack_temp_for_type,
put_var_into_stack, allocate_struct_function, current_function_name):
Likewise.
* integrate.c (copy_decl_for_inlining, expand_inline_function):
Likewise.
* langhooks.c (lhd_clear_binding_stack, write_global_declarations,
lhd_print_error_function): Likewise.
* opts.c (handle_option, decode_options): Likewise.
* passes.c (open_dump_file): Likewise.
* print-tree.c (print_node): Likewise.
* stmt.c (expand_fixup, fixup_gotos, expand_asm_operands,
expand_decl_cleanup, emit_case_nodes): Likewise.
* stor-layout.c (variable_size): Likewise.
* toplev.c (announce_function, wrapup_global_declarations,
check_global_declarations, compile_file, default_tree_printer,
process_options, lang_dependent_init, finalize): Likewise.
* tree-dump.c (dequeue_and_dump): Likewise.
* tree-inline.c (remap_decl, remap_block, copy_body_r,
initialize_inlined_parameters, declare_return_variable,
inlinable_function_p, expand_call_inline, optimize_inline_calls,
walk_tree, copy_tree_r): Likewise.
* tree-optimize.c (tree_rest_of_compilation): Likewise.
* tree.c (decl_assembler_name, tree_size, size_in_bytes, staticp,
unsafe_for_reeval, get_unwidened, get_narrower, get_callee_fndecl,
variably_modified_type_p, dump_tree_statistics): Likewise.
* varasm.c (assemble_variable, compare_constant, copy_constant,
force_const_mem, compute_reloc_for_constant, output_constant,
output_addressed_constants, initializer_constant_valid_p): Likewise.
From-SVN: r79481
2004-03-14 23:26:14 +01:00
|
|
|
|
arg = lang_hooks.truthvalue_conversion (arg);
|
2003-07-18 02:26:51 +02:00
|
|
|
|
return invert_truthvalue (arg);
|
|
|
|
|
|
|
|
|
|
|
|
case NOP_EXPR:
|
1992-02-28 19:53:39 +01:00
|
|
|
|
break;
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
case REALPART_EXPR:
|
|
|
|
|
|
if (TREE_CODE (arg) == COMPLEX_CST)
|
|
|
|
|
|
return TREE_REALPART (arg);
|
|
|
|
|
|
else if (TREE_CODE (TREE_TYPE (arg)) == COMPLEX_TYPE)
|
|
|
|
|
|
return fold (build1 (REALPART_EXPR, TREE_TYPE (TREE_TYPE (arg)), arg));
|
|
|
|
|
|
else
|
|
|
|
|
|
return arg;
|
1995-04-06 23:31:01 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
case IMAGPART_EXPR:
|
|
|
|
|
|
if (TREE_CODE (arg) == COMPLEX_CST)
|
|
|
|
|
|
return TREE_IMAGPART (arg);
|
|
|
|
|
|
else if (TREE_CODE (TREE_TYPE (arg)) == COMPLEX_TYPE)
|
|
|
|
|
|
return fold (build1 (IMAGPART_EXPR, TREE_TYPE (TREE_TYPE (arg)), arg));
|
|
|
|
|
|
else
|
|
|
|
|
|
return convert (TREE_TYPE (arg), integer_zero_node);
|
|
|
|
|
|
|
|
|
|
|
|
case PREINCREMENT_EXPR:
|
|
|
|
|
|
case POSTINCREMENT_EXPR:
|
|
|
|
|
|
case PREDECREMENT_EXPR:
|
|
|
|
|
|
case POSTDECREMENT_EXPR:
|
|
|
|
|
|
|
|
|
|
|
|
/* Increment or decrement the real part of the value,
|
|
|
|
|
|
and don't change the imaginary part. */
|
|
|
|
|
|
if (typecode == COMPLEX_TYPE)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
tree real, imag;
|
|
|
|
|
|
|
|
|
|
|
|
if (pedantic)
|
|
|
|
|
|
pedwarn ("ISO C does not support `++' and `--' on complex types");
|
|
|
|
|
|
|
|
|
|
|
|
arg = stabilize_reference (arg);
|
|
|
|
|
|
real = build_unary_op (REALPART_EXPR, arg, 1);
|
|
|
|
|
|
imag = build_unary_op (IMAGPART_EXPR, arg, 1);
|
|
|
|
|
|
return build (COMPLEX_EXPR, TREE_TYPE (arg),
|
|
|
|
|
|
build_unary_op (code, real, 1), imag);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
|
|
|
|
|
|
/* Report invalid types. */
|
|
|
|
|
|
|
|
|
|
|
|
if (typecode != POINTER_TYPE
|
|
|
|
|
|
&& typecode != INTEGER_TYPE && typecode != REAL_TYPE)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (code == PREINCREMENT_EXPR || code == POSTINCREMENT_EXPR)
|
|
|
|
|
|
error ("wrong type argument to increment");
|
|
|
|
|
|
else
|
|
|
|
|
|
error ("wrong type argument to decrement");
|
|
|
|
|
|
|
|
|
|
|
|
return error_mark_node;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
{
|
|
|
|
|
|
tree inc;
|
|
|
|
|
|
tree result_type = TREE_TYPE (arg);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
arg = get_unwidened (arg, 0);
|
|
|
|
|
|
argtype = TREE_TYPE (arg);
|
|
|
|
|
|
|
|
|
|
|
|
/* Compute the increment. */
|
|
|
|
|
|
|
|
|
|
|
|
if (typecode == POINTER_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* If pointer target is an undefined struct,
|
|
|
|
|
|
we just cannot know how to do the arithmetic. */
|
|
|
|
|
|
if (!COMPLETE_OR_VOID_TYPE_P (TREE_TYPE (result_type)))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (code == PREINCREMENT_EXPR || code == POSTINCREMENT_EXPR)
|
|
|
|
|
|
error ("increment of pointer to unknown structure");
|
|
|
|
|
|
else
|
|
|
|
|
|
error ("decrement of pointer to unknown structure");
|
|
|
|
|
|
}
|
|
|
|
|
|
else if ((pedantic || warn_pointer_arith)
|
|
|
|
|
|
&& (TREE_CODE (TREE_TYPE (result_type)) == FUNCTION_TYPE
|
|
|
|
|
|
|| TREE_CODE (TREE_TYPE (result_type)) == VOID_TYPE))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (code == PREINCREMENT_EXPR || code == POSTINCREMENT_EXPR)
|
|
|
|
|
|
pedwarn ("wrong type argument to increment");
|
|
|
|
|
|
else
|
|
|
|
|
|
pedwarn ("wrong type argument to decrement");
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
inc = c_size_in_bytes (TREE_TYPE (result_type));
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
inc = integer_one_node;
|
|
|
|
|
|
|
|
|
|
|
|
inc = convert (argtype, inc);
|
|
|
|
|
|
|
|
|
|
|
|
/* Complain about anything else that is not a true lvalue. */
|
|
|
|
|
|
if (!lvalue_or_else (arg, ((code == PREINCREMENT_EXPR
|
|
|
|
|
|
|| code == POSTINCREMENT_EXPR)
|
|
|
|
|
|
? "invalid lvalue in increment"
|
|
|
|
|
|
: "invalid lvalue in decrement")))
|
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
|
|
|
|
|
|
/* Report a read-only lvalue. */
|
|
|
|
|
|
if (TREE_READONLY (arg))
|
2004-03-01 00:43:29 +01:00
|
|
|
|
readonly_error (arg,
|
|
|
|
|
|
((code == PREINCREMENT_EXPR
|
|
|
|
|
|
|| code == POSTINCREMENT_EXPR)
|
|
|
|
|
|
? "increment" : "decrement"));
|
2003-07-18 02:26:51 +02:00
|
|
|
|
|
|
|
|
|
|
if (TREE_CODE (TREE_TYPE (arg)) == BOOLEAN_TYPE)
|
|
|
|
|
|
val = boolean_increment (code, arg);
|
|
|
|
|
|
else
|
|
|
|
|
|
val = build (code, TREE_TYPE (arg), arg, inc);
|
|
|
|
|
|
TREE_SIDE_EFFECTS (val) = 1;
|
|
|
|
|
|
val = convert (result_type, val);
|
|
|
|
|
|
if (TREE_CODE (val) != code)
|
2004-05-13 08:41:07 +02:00
|
|
|
|
TREE_NO_WARNING (val) = 1;
|
2003-07-18 02:26:51 +02:00
|
|
|
|
return val;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
case ADDR_EXPR:
|
|
|
|
|
|
/* Note that this operation never does default_conversion. */
|
|
|
|
|
|
|
|
|
|
|
|
/* Let &* cancel out to simplify resulting code. */
|
|
|
|
|
|
if (TREE_CODE (arg) == INDIRECT_REF)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Don't let this be an lvalue. */
|
|
|
|
|
|
if (lvalue_p (TREE_OPERAND (arg, 0)))
|
|
|
|
|
|
return non_lvalue (TREE_OPERAND (arg, 0));
|
|
|
|
|
|
return TREE_OPERAND (arg, 0);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
2000-01-24 21:10:04 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* For &x[y], return x+y */
|
|
|
|
|
|
if (TREE_CODE (arg) == ARRAY_REF)
|
2000-01-24 21:10:04 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (!c_mark_addressable (TREE_OPERAND (arg, 0)))
|
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
return build_binary_op (PLUS_EXPR, TREE_OPERAND (arg, 0),
|
|
|
|
|
|
TREE_OPERAND (arg, 1), 1);
|
2000-01-24 21:10:04 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Anything not already handled and not a true memory reference
|
|
|
|
|
|
or a non-lvalue array is an error. */
|
|
|
|
|
|
else if (typecode != FUNCTION_TYPE && !flag
|
|
|
|
|
|
&& !lvalue_or_else (arg, "invalid lvalue in unary `&'"))
|
|
|
|
|
|
return error_mark_node;
|
1993-03-04 21:36:23 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Ordinary case; arg is a COMPONENT_REF or a decl. */
|
|
|
|
|
|
argtype = TREE_TYPE (arg);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* If the lvalue is const or volatile, merge that into the type
|
|
|
|
|
|
to which the address will point. Note that you can't get a
|
|
|
|
|
|
restricted pointer by taking the address of something, so we
|
|
|
|
|
|
only have to deal with `const' and `volatile' here. */
|
|
|
|
|
|
if ((DECL_P (arg) || TREE_CODE_CLASS (TREE_CODE (arg)) == 'r')
|
|
|
|
|
|
&& (TREE_READONLY (arg) || TREE_THIS_VOLATILE (arg)))
|
|
|
|
|
|
argtype = c_build_type_variant (argtype,
|
|
|
|
|
|
TREE_READONLY (arg),
|
|
|
|
|
|
TREE_THIS_VOLATILE (arg));
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
argtype = build_pointer_type (argtype);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (!c_mark_addressable (arg))
|
|
|
|
|
|
return error_mark_node;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
{
|
|
|
|
|
|
tree addr;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (TREE_CODE (arg) == COMPONENT_REF)
|
|
|
|
|
|
{
|
|
|
|
|
|
tree field = TREE_OPERAND (arg, 1);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
addr = build_unary_op (ADDR_EXPR, TREE_OPERAND (arg, 0), flag);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (DECL_C_BIT_FIELD (field))
|
|
|
|
|
|
{
|
|
|
|
|
|
error ("attempt to take address of bit-field structure member `%s'",
|
|
|
|
|
|
IDENTIFIER_POINTER (DECL_NAME (field)));
|
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
addr = fold (build (PLUS_EXPR, argtype,
|
|
|
|
|
|
convert (argtype, addr),
|
|
|
|
|
|
convert (argtype, byte_position (field))));
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
addr = build1 (code, argtype, arg);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
alias.c (adjust_offset_for_component_ref): Use component_ref_field_offset.
* alias.c (adjust_offset_for_component_ref): Use
component_ref_field_offset.
* c-decl.c (build_array_declarator): Add news args for ARRAY_REF.
* c-gimplify.c (gimplify_expr_stmt): Use alloc_stmt_list.
(gimplify_decl_stmt): Call gimplify_type_sizes for type.
For decl, call gimplify_one_sizepos and use statement list.
(gimplify_compound_literal_expr): New arg PRE_P.
Add statement to PRE_P list and return DECL.
(c_gimplify_expr, case COMPOUND_LITERAL_EXPR): Add arg to
gimplify_compound_literal_expr.
* c-tree.h (getdecls): Deleted.
* c-typeck.c (build_component_ref): Add operand for COMPONENT_REF.
(build_array_ref): Add two operands for ARRAY_REF.
(build_unary_op): Set TREE_INVARIANT and TREE_CONSTANT for
COMPOUND_LITERAL_EXPR.
* coverage.c (tree_coverage_counter_ref): Add new operands
for ARRAY_REF.
* emit-rtl.c (component_ref_for_mem_expr): Add new operand
for COMPONENT_REF.
(set_mem_attributes_minus_bitpos): Use array_ref_low_bound
and array_ref_element_size.
(widen_memory_access):Use component_ref_field_offset.
* explow.c (update_nonlocal_goto_save_area): Add two operands
for ARRAY_REF.
* expr.c (array_ref_element_size, array_ref_low_bound): New functions.
(component_ref_field_offset): Likewise.
(get_inner_reference): Use them.
(expand_expr_real_1, case ARRAY_REF): Use array_ref_low_bound.
* fold-const.c (fold, case EQ_EXPR): Properly handle DECL_SIZE.
(fold_read_from_constant_string): Use array_ref_low_bound.
Verify that result is a character type.
(build_fold_indirect_ref): Add two operands for ARRAY_REF.
* function.c (expand_function_start): Likewise.
* gimple-low.c (expand_var_p): Delete duplicated line.
* gimplify.c: Add static decls for local functions.
(cgraph.h): Now included.
(create_tmp_var): Remove check for ARRAY_TYPE.
(copy_if_shared_r): Look at bounds and sizes of types.
(build_and_jump): Return alloc_stmt_list instead of build_empty_stmt.
(gimplify_exit_expr, shortcut_cond_expr): Likewise.
(gimplify_save_expr, gimple_push_cleanup): Likewise.
(gimplify_init_constructor): Likewise.
WANT_VALUE now bool.
If empty list with no result wanted, return GS_UNHANDLED.
Add additional operands for ARRAY_REF and COMPONENT_REF.
(canonicalize_component_ref): Convert to &array[L].
(gimplify_array_ref_to_plus): Use array_ref_element_size and
array_ref_lower_bound.
(build_addr_expr_with_type, build_addr_expr): New functions.
(gimplify_compound_lval): WANT_LVALUE now bool.
Major rework to allow handle_component_p and initialize and
gimplify new operands for ARRAY_REF, ARRAY_RANGE_REF, and
COMPONENT_REF.
(gimplify_array_ref): Deleted.
(gimplify_self_mod_expr): WANT_VALUE now bool.
(gimplify_modify_expr): Gimplify to_p and from_p later.
Factor out code into gimplify_modify_expr_rhs and call twice.
Move variable-size code earlier and handle PLACEHOLDER_EXPR.
(gimplify_modify_expr_rhs, gimplify_variable_sized_compare): New fns.
(gimplify_addr_expr, case VIEW_CONVERT_EXPR): New case.
(gimplify_expr, case ARRAY_REF): Delete special case.
Instead handle like COMPONENT_REF; also do ARRAY_RANGE_REF,
IMAGPART, and REALPART the same way.
(gimplify_expr, case VIEW_CONVERT_EXPR): New case.
(gimplify_expr): Call gimplify_variable_sized_compare if applicable.
Call alloc_stmt_list instead of build_empty_stmt.
Deal with _REF that's volatile.
(gimplify_type_sizes, gimplify_one_sizepos): New functions.
(unshare_body, unvisit_body): New functions.
(gimplify_body): Call them.
* stmt.c (expand_stack_alloc): Don't expand TYPE_MAX_VALUE.
* stor-layout.c (get_pending_sizes): Don't change SAVE_EXPR_CONTEXT.
* tree-alias-common.c (get_alias_var): Also skip ARRAY_RANGE_REF.
* tree-cfg.c (tree_node_can_be_shared): Treat ARRAY_RANGE_REF
like ARRAY_REF.
(verify_expr, case ADDR_EXPR): Use handled_component_p.
* tree-dfa.c (get_virtual_var): Likewise.
* tree-dump.c (dequeue_and_dump, case COMPONENT_REF, ARRAY_REF):
New cases to dump new operands; likewise for ARRAY_RANGE_REF.
* tree-eh.c (tree_could_trap, case ARRAY_RANGE_REF): Like ARRAY_REF.
* tree-gimple.c (is_gimple_addr_expr_arg): Add ARRAY_RANGE_REF
and INDIRECT_REF.
(get_base_address): Use handled_component_p.
* tree-gimple.h (gimplify_type_sizes, gimplify_one_sizepos): New.
* tree-line.c (walk_tree): Walk more things for types and decls.
* tree-mudflap.c (mf_build_check_statement_for): Add new operands
for ARRAY_REF and COMPONENT_REF.
(mx_xform_derefs_1): Clean up usage of decl sizes.
* tree-nested.c (build_addr): Use handled_component_p.
(walk_stmts, case CATCH_EXPR): Add missing "break".
(get_static_chain, get_frame_field): Add new operand for COMPONENT_REF.
(finalize_nesting_tree_1): Likewise.
(convert_nonlocal_reference, case ARRAY_RANGE_REF): Like ARRAY_REF
and process additional operands.
(convert_local_reference): Likewise.
* tree-outof-ssa.c (discover_nonconstant_array_refs_r): Treat
ARRAY_RANGE_REF similarly to ARRAY_REF.
* tree-pretty-print.c (dump_generic_node, case QUAL_UNION_TYPE): Handle
like RECORD_TYPE.
(dump_generic_node, case COMPONENT_REF): Print offset operand.
(dump_generic_node, case ARRAY_RANGE_REF): Treat like ARRAY_REF
and print lower bound and element size for both.
(op_prio, case ARRAY_RANGE_REF): Like ARRAY_REF.
* tree-sra.c (csc_build_component_ref): Add new operand.
(scalarize_call_expr): Use get_base_address.
* tree-ssa-ccp.c (widen_bitfield): Clean up size handling.
(maybe_fold_offset_to_array_ref): Rework to handle input having an
ARRAY_REF, refine handling of lower bound, and add new operands
for ARRAY_REF.
(maybe_fold_to_component_ref): Add new operand for COMPONENT_REF.
(maybe_fold_stmt_indirect): Only fold *&B to B if types match.
(maybe_fold_stmt_addition): Only handle constant lower bound.
* tree-ssa-operands.c (get_expr_operands): Minor rearrangements.
Treat ARRAY_REF and ARRAY_RANGE_REF the same; look at extra operands.
Look at new offset operand of COMPONENT_REF.
* tree-ssa.c (set_is_used): Use handled_component_p.
* tree.c (substitute_in_expr, case COMPONENT_REF): Add new operand.
(stabilize_reference, case COMPONENT_REF): Likewise.
(stabilize_reference, case ARRAY_RANGE_REF, ARRAY_REF): Similarly.
(recompute_tree_invariant_for_addr_expr): Completely rework to
be more precise. Also set TREE_SIDE_EFFECTS.
(build1_stat, case ARRAY_EXPR): Don't handle TREE_SIDE_EFFECTS here.
(build2_stat, build3_stat, build4_stat): For references,
propagate TREE_THIS_VOLATILE.
(get_unwidened): Add new operand for COMPONENT_REF.
(get_narrower): Likewise; use host_integerp for DECL_SIZE.
* tree.def (COMPONENT_REF): Add new operand.
(ARRAY_REF, ARRAY_RANGE_REF): Add two new operands.
* tree.h (array_ref_element_size, array_ref_low_bound): New decls.
(component_ref_field_offset): Likewise.
* config/alpha/alpha.c (alpha_va_start): Add new op for COMPONENT_REF.
(alpha_gimplify_va_arg): Likewise.
* config/i386/i386.c (ix86_va_start, ix86_gimplify_va_arg): Likewise.
* config/i860/i860.c (i860_va_start, i860_va_arg): Likewise.
* config/iq2000/iq2000.c (iq2000_va_arg): Likewise.
* config/mips/mips.c (mips_va_start, mips_va_arg): Likewise.
* config/rs6000/rs6000.c (rs6000_va_start, rs6000_gimplify_va_arg):
Likewise.
* config/s390/s390.c (s390_va_start, s390_gimplify_va_arg): Likewise.
* config/sh/sh.c (sh_va_start, sh_va_arg): Likewise.
* config/stormy16/stormy16.c (xstormy1_expand_builin_va_start):
Likewise.
(xstormy16_expand_builtin_va_arg): Likewise.
* config/xtensa/xtensa.c (xtensa_va_start, xtensa_va_arg): Likewise.
* cp/call.c (build_vfield_ref): Add new operand for COMPONENT_REF.
(build_new_method_call): Likewise.
* cp/decl.c (local_variable_p_walkfn): Don't walk into types.
* cp/decl2.c (grok_array_decl): Add new operands for ARRAY_REF.
(build_anon_union_vars): Add new operand for COMPONENT_REF.
* cp/init.c (buld_new): Add new operand for ARRAY_REF.
* cp/method.c (do_build_copy_constructor): New op for COMPONENT_REF.
(do_build_assign_ref): Likewise.
* cp/parser.c (cp_parser_direct_new_declarator): Add new operands
for ARRAY_REF.
(cp_parser_direct_declarator): Likewise.
* cp/pt.c (tsubst): Likewise.
(tsubst_copy, tsubst_copy_and_build): Likewise; also add new operand
for COMPONENT_REF.
* cp/semantics.c (finish_non_static_data_member): Add new operand
for COMPONENT_REF.
* cp/typeck.c (build_class_member_access_expr): Likewise.
(build_class_member_access_expr, finish_class_member_access_expr):
Likewise.
(build_ptrmemfunc_access_expr): Likewise.
(build_array_ref): Add new operands for ARRAY_REF.
* cp/typeck2.c (split_nonconstant_init_1): Likewise; COMPONENT_REF too.
* cp/tree.c (count_trees_r, no_linkage_helper): Don't walk in types.
* fortran/f95-lang.c (LANG_HOOKS_GIMPLE_BEFORE_INLINING): Deleted.
* fortran/trans-array.c (gfc_conv_descriptor_data): Add operand
for COMPONENT_REF.
(gfc_conv_descriptor_offset, gfc_conv_descriptor_dtype): Likewise.
(gfc_conv_descriptor_dimension, gfc_conv_descriptor_stride): Likewise.
(gfc_conv_descriptor_lbound, gfc_conv_descriptor_ubound): Likewise.
* fortran/trans-common.c (create_common): Likewise.
* fortran/trans-expr.c (gfc_conv_component_ref): Likewise.
* fortran/trans-io.c (set_parameter_value): Likewise.
(set_parameter_ref, set_string, set_flag, io_result): Likewise.
(transfer_expr): Likewise.
* fortran/trans-decl.c (gfc_trans_auto_character_variable):
Set up to get DECL_SIZE and DECL_SIZE_UNIT gimplified.
(gfc_simplify_function): New function.
(gfc_generate_function-code): Properly handle nested functions.
* fortran/trans.c (gfc_build_array_ref): Add two new operands
for ARRAY_REF.
* java/class.c (build_class_ref): Add new operand for COMPONENT_REF.
(build_static_field_ref): Likewise and add new operands for ARRAY_REF.
* java/constants.c (build_ref_from_constant_pool): Likewise.
* java/expr.c (build_java_array_length_access): Likewise.
(build_get_class, build_field_ref, build_known_method_ref): Likewise.
(invoke_build_dtable, build_invokevirtual): Likewise.
(build_invokeinterface, java_expand_expr): Likewise.
(emit_init_test_initialization): Likewise.
* java/java-gimplify.c (java_gimplify_new_array_init): Likewise.
* java/parse.y (make_qualifed_name, build_array_ref): Likewise.
* objc/ojbc-act.c (generate_static_references): Add additional
operands to ARRAY_REF.
(generate_strings, build_method_prototype_list_template): Likewise.
(generate_protocol_list): Likewise.
From-SVN: r83474
2004-06-22 05:07:05 +02:00
|
|
|
|
if (TREE_CODE (arg) == COMPOUND_LITERAL_EXPR)
|
|
|
|
|
|
TREE_INVARIANT (addr) = TREE_CONSTANT (addr) = 1;
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
return addr;
|
|
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
default:
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (argtype == 0)
|
|
|
|
|
|
argtype = TREE_TYPE (arg);
|
2004-06-07 20:49:36 +02:00
|
|
|
|
val = build1 (code, argtype, arg);
|
|
|
|
|
|
return require_constant_value ? fold_initializer (val) : fold (val);
|
2003-07-18 02:26:51 +02:00
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Return nonzero if REF is an lvalue valid for this language.
|
|
|
|
|
|
Lvalues can be assigned, unless their type has TYPE_READONLY.
|
2004-03-28 01:31:41 +01:00
|
|
|
|
Lvalues can have their address taken, unless they have C_DECL_REGISTER. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
int
|
|
|
|
|
|
lvalue_p (tree ref)
|
|
|
|
|
|
{
|
|
|
|
|
|
enum tree_code code = TREE_CODE (ref);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
switch (code)
|
|
|
|
|
|
{
|
|
|
|
|
|
case REALPART_EXPR:
|
|
|
|
|
|
case IMAGPART_EXPR:
|
|
|
|
|
|
case COMPONENT_REF:
|
|
|
|
|
|
return lvalue_p (TREE_OPERAND (ref, 0));
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
case COMPOUND_LITERAL_EXPR:
|
|
|
|
|
|
case STRING_CST:
|
|
|
|
|
|
return 1;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
case INDIRECT_REF:
|
|
|
|
|
|
case ARRAY_REF:
|
|
|
|
|
|
case VAR_DECL:
|
|
|
|
|
|
case PARM_DECL:
|
|
|
|
|
|
case RESULT_DECL:
|
|
|
|
|
|
case ERROR_MARK:
|
|
|
|
|
|
return (TREE_CODE (TREE_TYPE (ref)) != FUNCTION_TYPE
|
|
|
|
|
|
&& TREE_CODE (TREE_TYPE (ref)) != METHOD_TYPE);
|
* Clean up usages of TREE_INT_CST_LOW.
* c-parse.in (RESTORE_WARN_FLAGS): Use tree_low_cst.
* c-parse.y, c-parse.c, objc/objc-parse.y, objc/objc-parse.c:
Regenerated.
* c-tree.h (min_precision): Move declaration to here.
* c-typeck.c (build_binary_op): Use host_integerp and tree_low_cst.
(build_unary_op, add_pending_init): Use bit_position.
(pending_init_member, process_init_element): Likewise.
(really_start_incremental_init, push_init_level, pop_init_level):
Don't make copies of nodes or modify them in place, use consistent
types when tracking positions, and use tree routines computations.
(set_init_index, output_init_element): Likewise.
(output_pending_init_elements, process_init_element): Likewise.
* dbxout.c (dbxout_type_fields): Use bit_position, host_integerp,
tree_low_cst and int_bit_position; also minor cleanup.
(dbxout_type_method_1, dbxout_range_type, dbxout_type): Likewise.
(print_cst_octal): Precision is unsigned.
(dbxout_symbol): Ensure DECL_INITIAL is in-range and use tree_low_cst.
* dwarf2out.c (ceiling): Input and output are unsigned HOST_WIDE_INT.
(simple_type_align_in_bits): Result is unsigned int.
Use tree_int_low_cst and host_integerp.
(simple_type_size_in_bits): Result is unsigned HOST_WIDE_INT.
(field_byte_offset): Result is HOST_WIDE_INT.
Change types of internal variables so alignments are unsigned int,
offsets are HOST_WIDE_INT and sizes are unsigned HOST_WIDE_INT.
Use host_integerp, tree_low_cst, and int_bit_position.
(add_bit_offset_attribute): Likewise.
(add_data_member_location_attribute): Use tree_cst_low.
(add_bound_info): Use host_integerp, integer_zerop, and integer_onep.
(add_bit_size_attribute): Use tree_low_cst.
(add_pure_or_virtual_attribute, gen_enumeration_type_die): Likewise.
* dwarfout.c: Similar changes to dwarf2out.c.
* expr.c (expand_expr, case ARRAY_REF): Remove redundant code.
* genoutput.c (n_occurences): Return -1 for null string.
(strip_whitespace): Accept null string and make into function.
(scan_operands): Reflect above changes.
* sdbout.c (plain_type_1): Use host_integerp and tree_low_cst.
(sdbout_field_types, sdbout_one_type): Likewise; also use bit_position.
* ssa.c (rename_registers): Add missing cast of arg to bzero.
* tree.c (int_size_in_bytes): Check for too big to represent.
(bit_position, int_bit_position, host_integerp, tree_low_cst): New fns.
* tree.h (host_integerp, tree_low_cst, bit_position, int_bit_position):
New declarations.
(min_precision): Delete from here.
* varasm.c (decode_addr_const): Use host_integerp, bit_position,
and int_bit_position.
* objc/objc-act.c (encode_method_prototype): Sizes are HOST_WIDE_INT.
(encode_method_def): Likewise.
(build_ivar_list_initializer): Use int_bit_position.
(generate_shared_structures): Convert size.
(encode_type, encode_complete_bitfield): Use integer_zerop.
(encode_bitfield): Use tree_low_cst and int_bit_position.
* ch/typeck.c (min_precision): New function.
(build_chill_slice): Use host_integerp and tree_low_cst.
(expand_constant_to_buffer): Likewise and also int_bit_position.
LO is unsigned HOST_WIDE_INT
(build_chill_array_ref_1): Make `i' be HOST_WIDE_INT; use tree_low_cst.
(extract_constant_from_buffer): Sizes are now HOST_WIDE_INT.
Use host_integerp and tree_low_cst.
(build_chill_bin_type): Use host_integerp and tree_low_cst.
(layout_chill_range_type): Use tree_int_cst_sgn, compare_tree_int,
tree_low_cst, and min_precision.
(apply_chill_array_layout): Cleanups for types of variables
and use tree_int_cst_sgn, compare_tree_int, and tree_low_cst.
(apply_chill_field_layout): Likewise.
* cp/class.c (build_vbase_path): Use integer_zerop.
(build_vtable_entry): Use tree_low_cst.
(get_vfield_offset): Use bit_position.
(dfs_modify_vtables): New variable vindex_val; `i' is HOST_WIDE_INT.
Use tree_low_cst.
(check_bitfield_decl): Set DECL_SIZE using convert.
(build_base_field): Set DECL_SIZE and DECL_SIZE_UNIT using size_binop.
(layout_virtual_bases): DSIZE is unsigned HOST_WIDE_INT.
Use tree_low_cst.
(finish_struct_1): Use bit_position.
(dump_class_hierarchy): Use tree_low_cst.
* cp/cp-tree.h (min_precision): Add declaration.
* cp/decl.c (xref_tag, xref_basetypes): Use tree_low_cst.
* cp/error.c (dump_type_suffix): Use host_integerp and tree_low_cst.
(dump_expr): Use integer_zerop, host_integerp, and tree_low_cst.
* cp/expr.c (cplus_expand_constant): Use bit_position.
* cp/init.c (build_vec_init): Use host_integerp and tree_low_cst.
* cp/rtti.c (get_base_offset): Use bit_position.
* cp/typeck.c (build_binary_op): Use integer_zerop, compare_tree_int,
host_integerp, and tree_low_cst.
(pointer_int_sum): Use integer_zerop.
(build_component_addr): Use bit_position.
* java/class.c (make_field_value): Properly handle sizes.
(get_dispatch_vector): Use tree_low_cst and host_integerp.
(layout_class_method): Count using trees.
* java/decl.c (push_promoted_type): Set TYPE_{MIN,MAX}_VALUE with
copy_node.
* java/expr.c (java_array_data_offset): Use int_bit_position.
(build_newarray, build_anewarray): Use host_integerp and tree_low_cst.
(build_invokevirtual): Use tree_low_cst and do computations with trees.
From-SVN: r32607
2000-03-17 18:31:58 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
case BIND_EXPR:
|
|
|
|
|
|
return TREE_CODE (TREE_TYPE (ref)) == ARRAY_TYPE;
|
* Clean up usages of TREE_INT_CST_LOW.
* c-parse.in (RESTORE_WARN_FLAGS): Use tree_low_cst.
* c-parse.y, c-parse.c, objc/objc-parse.y, objc/objc-parse.c:
Regenerated.
* c-tree.h (min_precision): Move declaration to here.
* c-typeck.c (build_binary_op): Use host_integerp and tree_low_cst.
(build_unary_op, add_pending_init): Use bit_position.
(pending_init_member, process_init_element): Likewise.
(really_start_incremental_init, push_init_level, pop_init_level):
Don't make copies of nodes or modify them in place, use consistent
types when tracking positions, and use tree routines computations.
(set_init_index, output_init_element): Likewise.
(output_pending_init_elements, process_init_element): Likewise.
* dbxout.c (dbxout_type_fields): Use bit_position, host_integerp,
tree_low_cst and int_bit_position; also minor cleanup.
(dbxout_type_method_1, dbxout_range_type, dbxout_type): Likewise.
(print_cst_octal): Precision is unsigned.
(dbxout_symbol): Ensure DECL_INITIAL is in-range and use tree_low_cst.
* dwarf2out.c (ceiling): Input and output are unsigned HOST_WIDE_INT.
(simple_type_align_in_bits): Result is unsigned int.
Use tree_int_low_cst and host_integerp.
(simple_type_size_in_bits): Result is unsigned HOST_WIDE_INT.
(field_byte_offset): Result is HOST_WIDE_INT.
Change types of internal variables so alignments are unsigned int,
offsets are HOST_WIDE_INT and sizes are unsigned HOST_WIDE_INT.
Use host_integerp, tree_low_cst, and int_bit_position.
(add_bit_offset_attribute): Likewise.
(add_data_member_location_attribute): Use tree_cst_low.
(add_bound_info): Use host_integerp, integer_zerop, and integer_onep.
(add_bit_size_attribute): Use tree_low_cst.
(add_pure_or_virtual_attribute, gen_enumeration_type_die): Likewise.
* dwarfout.c: Similar changes to dwarf2out.c.
* expr.c (expand_expr, case ARRAY_REF): Remove redundant code.
* genoutput.c (n_occurences): Return -1 for null string.
(strip_whitespace): Accept null string and make into function.
(scan_operands): Reflect above changes.
* sdbout.c (plain_type_1): Use host_integerp and tree_low_cst.
(sdbout_field_types, sdbout_one_type): Likewise; also use bit_position.
* ssa.c (rename_registers): Add missing cast of arg to bzero.
* tree.c (int_size_in_bytes): Check for too big to represent.
(bit_position, int_bit_position, host_integerp, tree_low_cst): New fns.
* tree.h (host_integerp, tree_low_cst, bit_position, int_bit_position):
New declarations.
(min_precision): Delete from here.
* varasm.c (decode_addr_const): Use host_integerp, bit_position,
and int_bit_position.
* objc/objc-act.c (encode_method_prototype): Sizes are HOST_WIDE_INT.
(encode_method_def): Likewise.
(build_ivar_list_initializer): Use int_bit_position.
(generate_shared_structures): Convert size.
(encode_type, encode_complete_bitfield): Use integer_zerop.
(encode_bitfield): Use tree_low_cst and int_bit_position.
* ch/typeck.c (min_precision): New function.
(build_chill_slice): Use host_integerp and tree_low_cst.
(expand_constant_to_buffer): Likewise and also int_bit_position.
LO is unsigned HOST_WIDE_INT
(build_chill_array_ref_1): Make `i' be HOST_WIDE_INT; use tree_low_cst.
(extract_constant_from_buffer): Sizes are now HOST_WIDE_INT.
Use host_integerp and tree_low_cst.
(build_chill_bin_type): Use host_integerp and tree_low_cst.
(layout_chill_range_type): Use tree_int_cst_sgn, compare_tree_int,
tree_low_cst, and min_precision.
(apply_chill_array_layout): Cleanups for types of variables
and use tree_int_cst_sgn, compare_tree_int, and tree_low_cst.
(apply_chill_field_layout): Likewise.
* cp/class.c (build_vbase_path): Use integer_zerop.
(build_vtable_entry): Use tree_low_cst.
(get_vfield_offset): Use bit_position.
(dfs_modify_vtables): New variable vindex_val; `i' is HOST_WIDE_INT.
Use tree_low_cst.
(check_bitfield_decl): Set DECL_SIZE using convert.
(build_base_field): Set DECL_SIZE and DECL_SIZE_UNIT using size_binop.
(layout_virtual_bases): DSIZE is unsigned HOST_WIDE_INT.
Use tree_low_cst.
(finish_struct_1): Use bit_position.
(dump_class_hierarchy): Use tree_low_cst.
* cp/cp-tree.h (min_precision): Add declaration.
* cp/decl.c (xref_tag, xref_basetypes): Use tree_low_cst.
* cp/error.c (dump_type_suffix): Use host_integerp and tree_low_cst.
(dump_expr): Use integer_zerop, host_integerp, and tree_low_cst.
* cp/expr.c (cplus_expand_constant): Use bit_position.
* cp/init.c (build_vec_init): Use host_integerp and tree_low_cst.
* cp/rtti.c (get_base_offset): Use bit_position.
* cp/typeck.c (build_binary_op): Use integer_zerop, compare_tree_int,
host_integerp, and tree_low_cst.
(pointer_int_sum): Use integer_zerop.
(build_component_addr): Use bit_position.
* java/class.c (make_field_value): Properly handle sizes.
(get_dispatch_vector): Use tree_low_cst and host_integerp.
(layout_class_method): Count using trees.
* java/decl.c (push_promoted_type): Set TYPE_{MIN,MAX}_VALUE with
copy_node.
* java/expr.c (java_array_data_offset): Use int_bit_position.
(build_newarray, build_anewarray): Use host_integerp and tree_low_cst.
(build_invokevirtual): Use tree_low_cst and do computations with trees.
From-SVN: r32607
2000-03-17 18:31:58 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
default:
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Return nonzero if REF is an lvalue valid for this language;
|
|
|
|
|
|
otherwise, print an error message and return zero. */
|
1995-05-13 01:22:34 +02:00
|
|
|
|
|
2004-06-07 04:10:55 +02:00
|
|
|
|
static int
|
2003-07-18 02:26:51 +02:00
|
|
|
|
lvalue_or_else (tree ref, const char *msgid)
|
|
|
|
|
|
{
|
|
|
|
|
|
int win = lvalue_p (ref);
|
1995-03-03 00:39:09 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (! win)
|
|
|
|
|
|
error ("%s", msgid);
|
1995-04-01 22:18:49 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
return win;
|
|
|
|
|
|
}
|
* Clean up usages of TREE_INT_CST_LOW.
* c-parse.in (RESTORE_WARN_FLAGS): Use tree_low_cst.
* c-parse.y, c-parse.c, objc/objc-parse.y, objc/objc-parse.c:
Regenerated.
* c-tree.h (min_precision): Move declaration to here.
* c-typeck.c (build_binary_op): Use host_integerp and tree_low_cst.
(build_unary_op, add_pending_init): Use bit_position.
(pending_init_member, process_init_element): Likewise.
(really_start_incremental_init, push_init_level, pop_init_level):
Don't make copies of nodes or modify them in place, use consistent
types when tracking positions, and use tree routines computations.
(set_init_index, output_init_element): Likewise.
(output_pending_init_elements, process_init_element): Likewise.
* dbxout.c (dbxout_type_fields): Use bit_position, host_integerp,
tree_low_cst and int_bit_position; also minor cleanup.
(dbxout_type_method_1, dbxout_range_type, dbxout_type): Likewise.
(print_cst_octal): Precision is unsigned.
(dbxout_symbol): Ensure DECL_INITIAL is in-range and use tree_low_cst.
* dwarf2out.c (ceiling): Input and output are unsigned HOST_WIDE_INT.
(simple_type_align_in_bits): Result is unsigned int.
Use tree_int_low_cst and host_integerp.
(simple_type_size_in_bits): Result is unsigned HOST_WIDE_INT.
(field_byte_offset): Result is HOST_WIDE_INT.
Change types of internal variables so alignments are unsigned int,
offsets are HOST_WIDE_INT and sizes are unsigned HOST_WIDE_INT.
Use host_integerp, tree_low_cst, and int_bit_position.
(add_bit_offset_attribute): Likewise.
(add_data_member_location_attribute): Use tree_cst_low.
(add_bound_info): Use host_integerp, integer_zerop, and integer_onep.
(add_bit_size_attribute): Use tree_low_cst.
(add_pure_or_virtual_attribute, gen_enumeration_type_die): Likewise.
* dwarfout.c: Similar changes to dwarf2out.c.
* expr.c (expand_expr, case ARRAY_REF): Remove redundant code.
* genoutput.c (n_occurences): Return -1 for null string.
(strip_whitespace): Accept null string and make into function.
(scan_operands): Reflect above changes.
* sdbout.c (plain_type_1): Use host_integerp and tree_low_cst.
(sdbout_field_types, sdbout_one_type): Likewise; also use bit_position.
* ssa.c (rename_registers): Add missing cast of arg to bzero.
* tree.c (int_size_in_bytes): Check for too big to represent.
(bit_position, int_bit_position, host_integerp, tree_low_cst): New fns.
* tree.h (host_integerp, tree_low_cst, bit_position, int_bit_position):
New declarations.
(min_precision): Delete from here.
* varasm.c (decode_addr_const): Use host_integerp, bit_position,
and int_bit_position.
* objc/objc-act.c (encode_method_prototype): Sizes are HOST_WIDE_INT.
(encode_method_def): Likewise.
(build_ivar_list_initializer): Use int_bit_position.
(generate_shared_structures): Convert size.
(encode_type, encode_complete_bitfield): Use integer_zerop.
(encode_bitfield): Use tree_low_cst and int_bit_position.
* ch/typeck.c (min_precision): New function.
(build_chill_slice): Use host_integerp and tree_low_cst.
(expand_constant_to_buffer): Likewise and also int_bit_position.
LO is unsigned HOST_WIDE_INT
(build_chill_array_ref_1): Make `i' be HOST_WIDE_INT; use tree_low_cst.
(extract_constant_from_buffer): Sizes are now HOST_WIDE_INT.
Use host_integerp and tree_low_cst.
(build_chill_bin_type): Use host_integerp and tree_low_cst.
(layout_chill_range_type): Use tree_int_cst_sgn, compare_tree_int,
tree_low_cst, and min_precision.
(apply_chill_array_layout): Cleanups for types of variables
and use tree_int_cst_sgn, compare_tree_int, and tree_low_cst.
(apply_chill_field_layout): Likewise.
* cp/class.c (build_vbase_path): Use integer_zerop.
(build_vtable_entry): Use tree_low_cst.
(get_vfield_offset): Use bit_position.
(dfs_modify_vtables): New variable vindex_val; `i' is HOST_WIDE_INT.
Use tree_low_cst.
(check_bitfield_decl): Set DECL_SIZE using convert.
(build_base_field): Set DECL_SIZE and DECL_SIZE_UNIT using size_binop.
(layout_virtual_bases): DSIZE is unsigned HOST_WIDE_INT.
Use tree_low_cst.
(finish_struct_1): Use bit_position.
(dump_class_hierarchy): Use tree_low_cst.
* cp/cp-tree.h (min_precision): Add declaration.
* cp/decl.c (xref_tag, xref_basetypes): Use tree_low_cst.
* cp/error.c (dump_type_suffix): Use host_integerp and tree_low_cst.
(dump_expr): Use integer_zerop, host_integerp, and tree_low_cst.
* cp/expr.c (cplus_expand_constant): Use bit_position.
* cp/init.c (build_vec_init): Use host_integerp and tree_low_cst.
* cp/rtti.c (get_base_offset): Use bit_position.
* cp/typeck.c (build_binary_op): Use integer_zerop, compare_tree_int,
host_integerp, and tree_low_cst.
(pointer_int_sum): Use integer_zerop.
(build_component_addr): Use bit_position.
* java/class.c (make_field_value): Properly handle sizes.
(get_dispatch_vector): Use tree_low_cst and host_integerp.
(layout_class_method): Count using trees.
* java/decl.c (push_promoted_type): Set TYPE_{MIN,MAX}_VALUE with
copy_node.
* java/expr.c (java_array_data_offset): Use int_bit_position.
(build_newarray, build_anewarray): Use host_integerp and tree_low_cst.
(build_invokevirtual): Use tree_low_cst and do computations with trees.
From-SVN: r32607
2000-03-17 18:31:58 +01:00
|
|
|
|
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Warn about storing in something that is `const'. */
|
2002-09-08 05:20:35 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
void
|
2004-03-01 00:43:29 +01:00
|
|
|
|
readonly_error (tree arg, const char *msgid)
|
2002-09-08 05:20:35 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (TREE_CODE (arg) == COMPONENT_REF)
|
2002-09-08 05:20:35 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (TYPE_READONLY (TREE_TYPE (TREE_OPERAND (arg, 0))))
|
2004-03-01 00:43:29 +01:00
|
|
|
|
readonly_error (TREE_OPERAND (arg, 0), msgid);
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else
|
2004-03-01 00:43:29 +01:00
|
|
|
|
error ("%s of read-only member `%s'", _(msgid),
|
|
|
|
|
|
IDENTIFIER_POINTER (DECL_NAME (TREE_OPERAND (arg, 1))));
|
2002-09-08 05:20:35 +02:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else if (TREE_CODE (arg) == VAR_DECL)
|
2004-03-01 00:43:29 +01:00
|
|
|
|
error ("%s of read-only variable `%s'", _(msgid),
|
|
|
|
|
|
IDENTIFIER_POINTER (DECL_NAME (arg)));
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else
|
2004-03-01 00:43:29 +01:00
|
|
|
|
error ("%s of read-only location", _(msgid));
|
2002-09-08 05:20:35 +02:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
|
|
|
|
|
|
/* Mark EXP saying that we need to be able to take the
|
|
|
|
|
|
address of it; it should not be allocated in a register.
|
|
|
|
|
|
Returns true if successful. */
|
2002-09-08 05:20:35 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
bool
|
|
|
|
|
|
c_mark_addressable (tree exp)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
tree x = exp;
|
2001-08-30 14:46:52 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
while (1)
|
|
|
|
|
|
switch (TREE_CODE (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
case COMPONENT_REF:
|
|
|
|
|
|
if (DECL_C_BIT_FIELD (TREE_OPERAND (x, 1)))
|
|
|
|
|
|
{
|
|
|
|
|
|
error ("cannot take address of bit-field `%s'",
|
|
|
|
|
|
IDENTIFIER_POINTER (DECL_NAME (TREE_OPERAND (x, 1))));
|
|
|
|
|
|
return false;
|
|
|
|
|
|
}
|
2001-08-30 14:46:52 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* ... fall through ... */
|
2001-08-30 14:46:52 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
case ADDR_EXPR:
|
|
|
|
|
|
case ARRAY_REF:
|
|
|
|
|
|
case REALPART_EXPR:
|
|
|
|
|
|
case IMAGPART_EXPR:
|
|
|
|
|
|
x = TREE_OPERAND (x, 0);
|
|
|
|
|
|
break;
|
2001-08-30 14:46:52 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
case COMPOUND_LITERAL_EXPR:
|
|
|
|
|
|
case CONSTRUCTOR:
|
|
|
|
|
|
TREE_ADDRESSABLE (x) = 1;
|
|
|
|
|
|
return true;
|
2001-08-30 14:46:52 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
case VAR_DECL:
|
|
|
|
|
|
case CONST_DECL:
|
|
|
|
|
|
case PARM_DECL:
|
|
|
|
|
|
case RESULT_DECL:
|
2004-03-28 01:31:41 +01:00
|
|
|
|
if (C_DECL_REGISTER (x)
|
2003-07-18 02:26:51 +02:00
|
|
|
|
&& DECL_NONLOCAL (x))
|
|
|
|
|
|
{
|
2004-03-08 22:56:36 +01:00
|
|
|
|
if (TREE_PUBLIC (x) || TREE_STATIC (x) || DECL_EXTERNAL (x))
|
2003-07-18 02:26:51 +02:00
|
|
|
|
{
|
|
|
|
|
|
error ("global register variable `%s' used in nested function",
|
|
|
|
|
|
IDENTIFIER_POINTER (DECL_NAME (x)));
|
|
|
|
|
|
return false;
|
|
|
|
|
|
}
|
|
|
|
|
|
pedwarn ("register variable `%s' used in nested function",
|
|
|
|
|
|
IDENTIFIER_POINTER (DECL_NAME (x)));
|
|
|
|
|
|
}
|
2004-03-28 01:31:41 +01:00
|
|
|
|
else if (C_DECL_REGISTER (x))
|
2003-07-18 02:26:51 +02:00
|
|
|
|
{
|
2004-03-08 22:56:36 +01:00
|
|
|
|
if (TREE_PUBLIC (x) || TREE_STATIC (x) || DECL_EXTERNAL (x))
|
2003-07-18 02:26:51 +02:00
|
|
|
|
{
|
|
|
|
|
|
error ("address of global register variable `%s' requested",
|
|
|
|
|
|
IDENTIFIER_POINTER (DECL_NAME (x)));
|
|
|
|
|
|
return false;
|
|
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
pedwarn ("address of register variable `%s' requested",
|
|
|
|
|
|
IDENTIFIER_POINTER (DECL_NAME (x)));
|
|
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* drops in */
|
|
|
|
|
|
case FUNCTION_DECL:
|
|
|
|
|
|
TREE_ADDRESSABLE (x) = 1;
|
|
|
|
|
|
/* drops out */
|
|
|
|
|
|
default:
|
|
|
|
|
|
return true;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Build and return a conditional expression IFEXP ? OP1 : OP2. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
|
|
|
|
|
tree
|
2003-07-18 02:26:51 +02:00
|
|
|
|
build_conditional_expr (tree ifexp, tree op1, tree op2)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
tree type1;
|
|
|
|
|
|
tree type2;
|
|
|
|
|
|
enum tree_code code1;
|
|
|
|
|
|
enum tree_code code2;
|
|
|
|
|
|
tree result_type = NULL;
|
|
|
|
|
|
tree orig_op1 = op1, orig_op2 = op2;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
alias.c (get_alias_set): Replace calls via (*lang_hooks.foo) () with lang_hooks.foo ().
* alias.c (get_alias_set): Replace calls via (*lang_hooks.foo) ()
with lang_hooks.foo ().
* builtins.c (expand_builtin_va_arg): Likewise.
* c-common.c (fname_as_string, c_common_truthvalue_conversion,
c_common_type_for_mode, c_common_nodes_and_builtins,
handle_mode_attribute, handle_vector_size_attribute): Likewise.
* c-convert.c (convert): Likewise.
* c-format.c (check_format_types): Likewise.
* c-objc-common.c (c_tree_printer): Likewise.
* c-typeck.c (build_unary_op, build_conditional_expr,
build_binary_op): Likewise.
* calls.c (try_to_integrate, expand_call,
emit_library_call_value_1): Likewise.
* cgraph.c (cgraph_node_name, cgraph_function_possibly_inlined_p):
Likewise.
* cgraphunit.c (record_call_1, cgraph_analyze_function,
cgraph_expand_function): Likewise.
* convert.c (convert_to_pointer, convert_to_integer): Likewise.
* coverage.c (build_fn_info_type, build_ctr_info_type,
build_gcov_info, create_coverage): Likewise.
* dbxout.c (dbxout_init): Likewise.
* diagnostic.c (diagnostic_report_current_function): Likewise.
* dojump.c (do_jump): Likewise.
* dwarf2out.c (dwarf2_name): Likewise.
* except.c (init_eh): Likewise.
* explow.c (expr_size, int_expr_size): Likewise.
* expmed.c (make_tree, const_mult_add_overflow_p, expand_mult_add):
Likewise.
* expr.c (store_expr, store_constructor, safe_from_p,
expand_expr_real, do_store_flag, try_casesi): Likewise.
* function.c (push_function_context_to, pop_function_context_from,
free_after_parsing, assign_stack_local_1, assign_stack_temp_for_type,
put_var_into_stack, allocate_struct_function, current_function_name):
Likewise.
* integrate.c (copy_decl_for_inlining, expand_inline_function):
Likewise.
* langhooks.c (lhd_clear_binding_stack, write_global_declarations,
lhd_print_error_function): Likewise.
* opts.c (handle_option, decode_options): Likewise.
* passes.c (open_dump_file): Likewise.
* print-tree.c (print_node): Likewise.
* stmt.c (expand_fixup, fixup_gotos, expand_asm_operands,
expand_decl_cleanup, emit_case_nodes): Likewise.
* stor-layout.c (variable_size): Likewise.
* toplev.c (announce_function, wrapup_global_declarations,
check_global_declarations, compile_file, default_tree_printer,
process_options, lang_dependent_init, finalize): Likewise.
* tree-dump.c (dequeue_and_dump): Likewise.
* tree-inline.c (remap_decl, remap_block, copy_body_r,
initialize_inlined_parameters, declare_return_variable,
inlinable_function_p, expand_call_inline, optimize_inline_calls,
walk_tree, copy_tree_r): Likewise.
* tree-optimize.c (tree_rest_of_compilation): Likewise.
* tree.c (decl_assembler_name, tree_size, size_in_bytes, staticp,
unsafe_for_reeval, get_unwidened, get_narrower, get_callee_fndecl,
variably_modified_type_p, dump_tree_statistics): Likewise.
* varasm.c (assemble_variable, compare_constant, copy_constant,
force_const_mem, compute_reloc_for_constant, output_constant,
output_addressed_constants, initializer_constant_valid_p): Likewise.
From-SVN: r79481
2004-03-14 23:26:14 +01:00
|
|
|
|
ifexp = lang_hooks.truthvalue_conversion (default_conversion (ifexp));
|
2003-07-18 02:26:51 +02:00
|
|
|
|
|
|
|
|
|
|
/* Promote both alternatives. */
|
|
|
|
|
|
|
|
|
|
|
|
if (TREE_CODE (TREE_TYPE (op1)) != VOID_TYPE)
|
|
|
|
|
|
op1 = default_conversion (op1);
|
|
|
|
|
|
if (TREE_CODE (TREE_TYPE (op2)) != VOID_TYPE)
|
|
|
|
|
|
op2 = default_conversion (op2);
|
|
|
|
|
|
|
|
|
|
|
|
if (TREE_CODE (ifexp) == ERROR_MARK
|
|
|
|
|
|
|| TREE_CODE (TREE_TYPE (op1)) == ERROR_MARK
|
|
|
|
|
|
|| TREE_CODE (TREE_TYPE (op2)) == ERROR_MARK)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
type1 = TREE_TYPE (op1);
|
|
|
|
|
|
code1 = TREE_CODE (type1);
|
|
|
|
|
|
type2 = TREE_TYPE (op2);
|
|
|
|
|
|
code2 = TREE_CODE (type2);
|
|
|
|
|
|
|
2004-01-24 01:30:58 +01:00
|
|
|
|
/* C90 does not permit non-lvalue arrays in conditional expressions.
|
|
|
|
|
|
In C99 they will be pointers by now. */
|
|
|
|
|
|
if (code1 == ARRAY_TYPE || code2 == ARRAY_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
error ("non-lvalue array in conditional expression");
|
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Quickly detect the usual case where op1 and op2 have the same type
|
|
|
|
|
|
after promotion. */
|
|
|
|
|
|
if (TYPE_MAIN_VARIANT (type1) == TYPE_MAIN_VARIANT (type2))
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (type1 == type2)
|
|
|
|
|
|
result_type = type1;
|
|
|
|
|
|
else
|
|
|
|
|
|
result_type = TYPE_MAIN_VARIANT (type1);
|
|
|
|
|
|
}
|
|
|
|
|
|
else if ((code1 == INTEGER_TYPE || code1 == REAL_TYPE
|
|
|
|
|
|
|| code1 == COMPLEX_TYPE)
|
|
|
|
|
|
&& (code2 == INTEGER_TYPE || code2 == REAL_TYPE
|
|
|
|
|
|
|| code2 == COMPLEX_TYPE))
|
|
|
|
|
|
{
|
|
|
|
|
|
result_type = common_type (type1, type2);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* If -Wsign-compare, warn here if type1 and type2 have
|
|
|
|
|
|
different signedness. We'll promote the signed to unsigned
|
|
|
|
|
|
and later code won't know it used to be different.
|
|
|
|
|
|
Do this check on the original types, so that explicit casts
|
|
|
|
|
|
will be considered, but default promotions won't. */
|
|
|
|
|
|
if (warn_sign_compare && !skip_evaluation)
|
1999-01-27 02:43:17 +01:00
|
|
|
|
{
|
builtins.c, [...]: Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* builtins.c, c-aux-info.c, c-common.c, c-cppbuiltin.c, c-decl.c:
Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* c-format.c, c-opts.c, c-pretty-print.c, c-typeck.c: Likewise.
* calls.c, convert.c, dbxout.c, dojump.c, dwarf2out.c: Likewise.
* expmed.c, expr.c, fold-const.c, function.c, integrate.c: Likewise.
* optabs.c, sdbout.c, stmt.c, stor-layout.c, tree-dump.c: Likewise.
* tree.c, config/iq2000/iq2000.c, config/m32r/m32r.c: Likewise.
* config/mips/mips.c, config/rs6000/rs6000.c: Likewise.
* config/s390/s390.c, config/sparc/sparc.c, objc/objc-act.c: Likewise.
* stor-layout.c (layout_type, case COMPLEX_TYPE): Test for
REAL_TYPE, not INTEGER_TYPE.
(layout_type, case VECTOR_TYPE): Simplify code.
* tree.c (build_vector_type_for_mode): Remove dup unsigned setting.
* tree.h: Update comments.
(STRIP_NOPS): Use TYPE_UNSIGNED.
(TYPE_UNSIGNED): New macro.
(TYPE_TRAP_SIGNED): Remove now redundant check.
(SAVE_EXPR_NOPLACEHOLDER): Don't use TREE_UNSIGNED.
* cp/call.c (joust): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* cp/class.c (check_bitfield_decl): Likewise.
* cp/cvt.c (type_promotes_to): Likewise.
* cp/decl.c (finish_enum): Likewise.
* cp/mangle.c (write_builtin_type): Likewise.
* cp/semantics.c (finish_switch_cond, finish_unary_op_expr): Likewise.
* cp/typeck.c (type_after_usual_arithmetic_conversions): Likewise.
(build_binary_op): Likewise.
* f/com.c (ffecom_arrayref_): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
(ffecom_expr_): Likewise.
* java/jcf-write.c (generate_bytecode_insns): Use TYPE_UNSIGNED.
* treelang/treetree.c (tree_lang_signed_or_unsigned_type):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/decl.c (gnat_to_gnu_entity, make_type_from_size):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/trans.c (tree_transform, convert_with_check): Likewise.
* ada/utils.c (gnat_signed_or_unsigned_type): Likewise.
(build_vms_descriptor, unchecked_convert): Likewise.
* ada/utils2.c (nonbinary_modular_operation): Likewise.
From-SVN: r80287
2004-04-01 05:50:43 +02:00
|
|
|
|
int unsigned_op1 = TYPE_UNSIGNED (TREE_TYPE (orig_op1));
|
|
|
|
|
|
int unsigned_op2 = TYPE_UNSIGNED (TREE_TYPE (orig_op2));
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (unsigned_op1 ^ unsigned_op2)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Do not warn if the result type is signed, since the
|
|
|
|
|
|
signed type will only be chosen if it can represent
|
|
|
|
|
|
all the values of the unsigned type. */
|
builtins.c, [...]: Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* builtins.c, c-aux-info.c, c-common.c, c-cppbuiltin.c, c-decl.c:
Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* c-format.c, c-opts.c, c-pretty-print.c, c-typeck.c: Likewise.
* calls.c, convert.c, dbxout.c, dojump.c, dwarf2out.c: Likewise.
* expmed.c, expr.c, fold-const.c, function.c, integrate.c: Likewise.
* optabs.c, sdbout.c, stmt.c, stor-layout.c, tree-dump.c: Likewise.
* tree.c, config/iq2000/iq2000.c, config/m32r/m32r.c: Likewise.
* config/mips/mips.c, config/rs6000/rs6000.c: Likewise.
* config/s390/s390.c, config/sparc/sparc.c, objc/objc-act.c: Likewise.
* stor-layout.c (layout_type, case COMPLEX_TYPE): Test for
REAL_TYPE, not INTEGER_TYPE.
(layout_type, case VECTOR_TYPE): Simplify code.
* tree.c (build_vector_type_for_mode): Remove dup unsigned setting.
* tree.h: Update comments.
(STRIP_NOPS): Use TYPE_UNSIGNED.
(TYPE_UNSIGNED): New macro.
(TYPE_TRAP_SIGNED): Remove now redundant check.
(SAVE_EXPR_NOPLACEHOLDER): Don't use TREE_UNSIGNED.
* cp/call.c (joust): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* cp/class.c (check_bitfield_decl): Likewise.
* cp/cvt.c (type_promotes_to): Likewise.
* cp/decl.c (finish_enum): Likewise.
* cp/mangle.c (write_builtin_type): Likewise.
* cp/semantics.c (finish_switch_cond, finish_unary_op_expr): Likewise.
* cp/typeck.c (type_after_usual_arithmetic_conversions): Likewise.
(build_binary_op): Likewise.
* f/com.c (ffecom_arrayref_): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
(ffecom_expr_): Likewise.
* java/jcf-write.c (generate_bytecode_insns): Use TYPE_UNSIGNED.
* treelang/treetree.c (tree_lang_signed_or_unsigned_type):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/decl.c (gnat_to_gnu_entity, make_type_from_size):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/trans.c (tree_transform, convert_with_check): Likewise.
* ada/utils.c (gnat_signed_or_unsigned_type): Likewise.
(build_vms_descriptor, unchecked_convert): Likewise.
* ada/utils2.c (nonbinary_modular_operation): Likewise.
From-SVN: r80287
2004-04-01 05:50:43 +02:00
|
|
|
|
if (! TYPE_UNSIGNED (result_type))
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* OK */;
|
|
|
|
|
|
/* Do not warn if the signed quantity is an unsuffixed
|
|
|
|
|
|
integer literal (or some static constant expression
|
|
|
|
|
|
involving such literals) and it is non-negative. */
|
2004-06-21 11:15:29 +02:00
|
|
|
|
else if ((unsigned_op2 && tree_expr_nonnegative_p (op1))
|
|
|
|
|
|
|| (unsigned_op1 && tree_expr_nonnegative_p (op2)))
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* OK */;
|
|
|
|
|
|
else
|
|
|
|
|
|
warning ("signed and unsigned type in conditional expression");
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (code1 == VOID_TYPE || code2 == VOID_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (pedantic && (code1 != VOID_TYPE || code2 != VOID_TYPE))
|
|
|
|
|
|
pedwarn ("ISO C forbids conditional expr with only one void side");
|
|
|
|
|
|
result_type = void_type_node;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (code1 == POINTER_TYPE && code2 == POINTER_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (comp_target_types (type1, type2, 1))
|
2004-06-06 17:21:59 +02:00
|
|
|
|
result_type = common_pointer_type (type1, type2);
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else if (integer_zerop (op1) && TREE_TYPE (type1) == void_type_node
|
|
|
|
|
|
&& TREE_CODE (orig_op1) != NOP_EXPR)
|
|
|
|
|
|
result_type = qualify_type (type2, type1);
|
|
|
|
|
|
else if (integer_zerop (op2) && TREE_TYPE (type2) == void_type_node
|
|
|
|
|
|
&& TREE_CODE (orig_op2) != NOP_EXPR)
|
|
|
|
|
|
result_type = qualify_type (type1, type2);
|
|
|
|
|
|
else if (VOID_TYPE_P (TREE_TYPE (type1)))
|
2002-07-03 11:49:46 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (pedantic && TREE_CODE (TREE_TYPE (type2)) == FUNCTION_TYPE)
|
|
|
|
|
|
pedwarn ("ISO C forbids conditional expr between `void *' and function pointer");
|
|
|
|
|
|
result_type = build_pointer_type (qualify_type (TREE_TYPE (type1),
|
|
|
|
|
|
TREE_TYPE (type2)));
|
2002-07-03 11:49:46 +02:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else if (VOID_TYPE_P (TREE_TYPE (type2)))
|
1993-07-18 22:27:18 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (pedantic && TREE_CODE (TREE_TYPE (type1)) == FUNCTION_TYPE)
|
|
|
|
|
|
pedwarn ("ISO C forbids conditional expr between `void *' and function pointer");
|
|
|
|
|
|
result_type = build_pointer_type (qualify_type (TREE_TYPE (type2),
|
|
|
|
|
|
TREE_TYPE (type1)));
|
1993-07-18 22:27:18 +02:00
|
|
|
|
}
|
2002-07-03 11:49:46 +02:00
|
|
|
|
else
|
1999-01-27 02:43:17 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
pedwarn ("pointer type mismatch in conditional expression");
|
|
|
|
|
|
result_type = build_pointer_type (void_type_node);
|
1999-01-27 02:43:17 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
}
|
|
|
|
|
|
else if (code1 == POINTER_TYPE && code2 == INTEGER_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (! integer_zerop (op2))
|
|
|
|
|
|
pedwarn ("pointer/integer type mismatch in conditional expression");
|
|
|
|
|
|
else
|
1999-01-27 02:43:17 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
op2 = null_pointer_node;
|
1999-01-27 02:43:17 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
result_type = type1;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (code2 == POINTER_TYPE && code1 == INTEGER_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (!integer_zerop (op1))
|
|
|
|
|
|
pedwarn ("pointer/integer type mismatch in conditional expression");
|
|
|
|
|
|
else
|
1999-01-27 02:43:17 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
op1 = null_pointer_node;
|
1999-01-27 02:43:17 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
result_type = type2;
|
|
|
|
|
|
}
|
1993-07-18 22:27:18 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (!result_type)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (flag_cond_mismatch)
|
|
|
|
|
|
result_type = void_type_node;
|
|
|
|
|
|
else
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
error ("type mismatch in conditional expression");
|
1999-01-27 02:43:17 +01:00
|
|
|
|
return error_mark_node;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Merge const and volatile flags of the incoming types. */
|
|
|
|
|
|
result_type
|
|
|
|
|
|
= build_type_variant (result_type,
|
|
|
|
|
|
TREE_READONLY (op1) || TREE_READONLY (op2),
|
|
|
|
|
|
TREE_THIS_VOLATILE (op1) || TREE_THIS_VOLATILE (op2));
|
1993-03-04 21:36:23 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (result_type != TREE_TYPE (op1))
|
|
|
|
|
|
op1 = convert_and_check (result_type, op1);
|
|
|
|
|
|
if (result_type != TREE_TYPE (op2))
|
|
|
|
|
|
op2 = convert_and_check (result_type, op2);
|
1993-03-04 21:36:23 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (TREE_CODE (ifexp) == INTEGER_CST)
|
2004-01-20 02:38:27 +01:00
|
|
|
|
return non_lvalue (integer_zerop (ifexp) ? op2 : op1);
|
2003-06-22 15:41:26 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
return fold (build (COND_EXPR, result_type, ifexp, op1, op2));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
c-tree.h (struct c_expr): Define.
* c-tree.h (struct c_expr): Define.
(C_SET_EXP_ORIGINAL_CODE): Remove.
(parser_build_binary_op, build_compound_expr): Update prototypes.
* c-parse.in (%union): Add exprtype.
(FUNC_NAME): Mark as ttype.
(expr, expr_no_commas, cast_expr, unary_expr, primary): Change to
exprtype.
(expr): Update. Define directly in terms of expr_no_commas
instead of using nonnull_exprlist.
(nonnull_exprlist, unary_expr, cast_expr, expr_no_commas, primary,
offsetof_member_designator, typespec_nonreserved_nonattr, init,
initval, designator, component_declarator,
component_notype_declarator, enumerator, array_declarator,
condition, exexpr, switch_statement, stmt_nocomp, stmt,
nonnull_asm_operands, ivar_declarator, receiver): Update. Don't
set C_EXP_ORIGINAL_CODE. Use TREE_NO_WARNING for assignments
where appropriate.
* c-common.h (C_EXP_ORIGINAL_CODE): Remove.
* c-common.c (c_common_truthvalue_conversion): Don't check
C_EXP_ORIGINAL_CODE.
* c-typeck.c (parser_build_binary_op): Use c_expr structures.
Don't use C_EXP_ORIGINAL_CODE.
(default_conversion, default_function_array_conversion): Don't use
C_EXP_ORIGINAL_CODE. Preserve TREE_NO_WARNING.
(internal_build_compound_expr): Merge into build_compound_expr.
(build_compound_expr): Take two operands instead of a TREE_LIST.
* objc/objc-act.c (get_super_receiver): Update calls to
build_compound_expr.
cp:
* typeck.c (build_modify_expr, build_x_modify_expr): Set
TREE_NO_WARNING on assignments with an operator other than '='.
testsuite:
* g++.dg/warn/Wparentheses-1.C, g++.dg/warn/Wparentheses-2.C,
gcc.dg/Wparentheses-10.c: New tests.
* gcc.dg/Wparentheses-5.c: Remove XFAILs.
From-SVN: r84911
2004-07-19 10:38:52 +02:00
|
|
|
|
/* Return a compound expression that performs two expressions and
|
|
|
|
|
|
returns the value of the second of them. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
tree
|
c-tree.h (struct c_expr): Define.
* c-tree.h (struct c_expr): Define.
(C_SET_EXP_ORIGINAL_CODE): Remove.
(parser_build_binary_op, build_compound_expr): Update prototypes.
* c-parse.in (%union): Add exprtype.
(FUNC_NAME): Mark as ttype.
(expr, expr_no_commas, cast_expr, unary_expr, primary): Change to
exprtype.
(expr): Update. Define directly in terms of expr_no_commas
instead of using nonnull_exprlist.
(nonnull_exprlist, unary_expr, cast_expr, expr_no_commas, primary,
offsetof_member_designator, typespec_nonreserved_nonattr, init,
initval, designator, component_declarator,
component_notype_declarator, enumerator, array_declarator,
condition, exexpr, switch_statement, stmt_nocomp, stmt,
nonnull_asm_operands, ivar_declarator, receiver): Update. Don't
set C_EXP_ORIGINAL_CODE. Use TREE_NO_WARNING for assignments
where appropriate.
* c-common.h (C_EXP_ORIGINAL_CODE): Remove.
* c-common.c (c_common_truthvalue_conversion): Don't check
C_EXP_ORIGINAL_CODE.
* c-typeck.c (parser_build_binary_op): Use c_expr structures.
Don't use C_EXP_ORIGINAL_CODE.
(default_conversion, default_function_array_conversion): Don't use
C_EXP_ORIGINAL_CODE. Preserve TREE_NO_WARNING.
(internal_build_compound_expr): Merge into build_compound_expr.
(build_compound_expr): Take two operands instead of a TREE_LIST.
* objc/objc-act.c (get_super_receiver): Update calls to
build_compound_expr.
cp:
* typeck.c (build_modify_expr, build_x_modify_expr): Set
TREE_NO_WARNING on assignments with an operator other than '='.
testsuite:
* g++.dg/warn/Wparentheses-1.C, g++.dg/warn/Wparentheses-2.C,
gcc.dg/Wparentheses-10.c: New tests.
* gcc.dg/Wparentheses-5.c: Remove XFAILs.
From-SVN: r84911
2004-07-19 10:38:52 +02:00
|
|
|
|
build_compound_expr (tree expr1, tree expr2)
|
2003-07-18 02:26:51 +02:00
|
|
|
|
{
|
c-tree.h (struct c_expr): Define.
* c-tree.h (struct c_expr): Define.
(C_SET_EXP_ORIGINAL_CODE): Remove.
(parser_build_binary_op, build_compound_expr): Update prototypes.
* c-parse.in (%union): Add exprtype.
(FUNC_NAME): Mark as ttype.
(expr, expr_no_commas, cast_expr, unary_expr, primary): Change to
exprtype.
(expr): Update. Define directly in terms of expr_no_commas
instead of using nonnull_exprlist.
(nonnull_exprlist, unary_expr, cast_expr, expr_no_commas, primary,
offsetof_member_designator, typespec_nonreserved_nonattr, init,
initval, designator, component_declarator,
component_notype_declarator, enumerator, array_declarator,
condition, exexpr, switch_statement, stmt_nocomp, stmt,
nonnull_asm_operands, ivar_declarator, receiver): Update. Don't
set C_EXP_ORIGINAL_CODE. Use TREE_NO_WARNING for assignments
where appropriate.
* c-common.h (C_EXP_ORIGINAL_CODE): Remove.
* c-common.c (c_common_truthvalue_conversion): Don't check
C_EXP_ORIGINAL_CODE.
* c-typeck.c (parser_build_binary_op): Use c_expr structures.
Don't use C_EXP_ORIGINAL_CODE.
(default_conversion, default_function_array_conversion): Don't use
C_EXP_ORIGINAL_CODE. Preserve TREE_NO_WARNING.
(internal_build_compound_expr): Merge into build_compound_expr.
(build_compound_expr): Take two operands instead of a TREE_LIST.
* objc/objc-act.c (get_super_receiver): Update calls to
build_compound_expr.
cp:
* typeck.c (build_modify_expr, build_x_modify_expr): Set
TREE_NO_WARNING on assignments with an operator other than '='.
testsuite:
* g++.dg/warn/Wparentheses-1.C, g++.dg/warn/Wparentheses-2.C,
gcc.dg/Wparentheses-10.c: New tests.
* gcc.dg/Wparentheses-5.c: Remove XFAILs.
From-SVN: r84911
2004-07-19 10:38:52 +02:00
|
|
|
|
/* Convert arrays and functions to pointers. */
|
|
|
|
|
|
expr2 = default_function_array_conversion (expr2);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
c-tree.h (struct c_expr): Define.
* c-tree.h (struct c_expr): Define.
(C_SET_EXP_ORIGINAL_CODE): Remove.
(parser_build_binary_op, build_compound_expr): Update prototypes.
* c-parse.in (%union): Add exprtype.
(FUNC_NAME): Mark as ttype.
(expr, expr_no_commas, cast_expr, unary_expr, primary): Change to
exprtype.
(expr): Update. Define directly in terms of expr_no_commas
instead of using nonnull_exprlist.
(nonnull_exprlist, unary_expr, cast_expr, expr_no_commas, primary,
offsetof_member_designator, typespec_nonreserved_nonattr, init,
initval, designator, component_declarator,
component_notype_declarator, enumerator, array_declarator,
condition, exexpr, switch_statement, stmt_nocomp, stmt,
nonnull_asm_operands, ivar_declarator, receiver): Update. Don't
set C_EXP_ORIGINAL_CODE. Use TREE_NO_WARNING for assignments
where appropriate.
* c-common.h (C_EXP_ORIGINAL_CODE): Remove.
* c-common.c (c_common_truthvalue_conversion): Don't check
C_EXP_ORIGINAL_CODE.
* c-typeck.c (parser_build_binary_op): Use c_expr structures.
Don't use C_EXP_ORIGINAL_CODE.
(default_conversion, default_function_array_conversion): Don't use
C_EXP_ORIGINAL_CODE. Preserve TREE_NO_WARNING.
(internal_build_compound_expr): Merge into build_compound_expr.
(build_compound_expr): Take two operands instead of a TREE_LIST.
* objc/objc-act.c (get_super_receiver): Update calls to
build_compound_expr.
cp:
* typeck.c (build_modify_expr, build_x_modify_expr): Set
TREE_NO_WARNING on assignments with an operator other than '='.
testsuite:
* g++.dg/warn/Wparentheses-1.C, g++.dg/warn/Wparentheses-2.C,
gcc.dg/Wparentheses-10.c: New tests.
* gcc.dg/Wparentheses-5.c: Remove XFAILs.
From-SVN: r84911
2004-07-19 10:38:52 +02:00
|
|
|
|
/* Don't let (0, 0) be null pointer constant. */
|
|
|
|
|
|
if (integer_zerop (expr2))
|
|
|
|
|
|
expr2 = non_lvalue (expr2);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
c-tree.h (struct c_expr): Define.
* c-tree.h (struct c_expr): Define.
(C_SET_EXP_ORIGINAL_CODE): Remove.
(parser_build_binary_op, build_compound_expr): Update prototypes.
* c-parse.in (%union): Add exprtype.
(FUNC_NAME): Mark as ttype.
(expr, expr_no_commas, cast_expr, unary_expr, primary): Change to
exprtype.
(expr): Update. Define directly in terms of expr_no_commas
instead of using nonnull_exprlist.
(nonnull_exprlist, unary_expr, cast_expr, expr_no_commas, primary,
offsetof_member_designator, typespec_nonreserved_nonattr, init,
initval, designator, component_declarator,
component_notype_declarator, enumerator, array_declarator,
condition, exexpr, switch_statement, stmt_nocomp, stmt,
nonnull_asm_operands, ivar_declarator, receiver): Update. Don't
set C_EXP_ORIGINAL_CODE. Use TREE_NO_WARNING for assignments
where appropriate.
* c-common.h (C_EXP_ORIGINAL_CODE): Remove.
* c-common.c (c_common_truthvalue_conversion): Don't check
C_EXP_ORIGINAL_CODE.
* c-typeck.c (parser_build_binary_op): Use c_expr structures.
Don't use C_EXP_ORIGINAL_CODE.
(default_conversion, default_function_array_conversion): Don't use
C_EXP_ORIGINAL_CODE. Preserve TREE_NO_WARNING.
(internal_build_compound_expr): Merge into build_compound_expr.
(build_compound_expr): Take two operands instead of a TREE_LIST.
* objc/objc-act.c (get_super_receiver): Update calls to
build_compound_expr.
cp:
* typeck.c (build_modify_expr, build_x_modify_expr): Set
TREE_NO_WARNING on assignments with an operator other than '='.
testsuite:
* g++.dg/warn/Wparentheses-1.C, g++.dg/warn/Wparentheses-2.C,
gcc.dg/Wparentheses-10.c: New tests.
* gcc.dg/Wparentheses-5.c: Remove XFAILs.
From-SVN: r84911
2004-07-19 10:38:52 +02:00
|
|
|
|
if (! TREE_SIDE_EFFECTS (expr1))
|
2003-07-18 02:26:51 +02:00
|
|
|
|
{
|
|
|
|
|
|
/* The left-hand operand of a comma expression is like an expression
|
|
|
|
|
|
statement: with -Wextra or -Wunused, we should warn if it doesn't have
|
|
|
|
|
|
any side-effects, unless it was explicitly cast to (void). */
|
|
|
|
|
|
if (warn_unused_value
|
c-tree.h (struct c_expr): Define.
* c-tree.h (struct c_expr): Define.
(C_SET_EXP_ORIGINAL_CODE): Remove.
(parser_build_binary_op, build_compound_expr): Update prototypes.
* c-parse.in (%union): Add exprtype.
(FUNC_NAME): Mark as ttype.
(expr, expr_no_commas, cast_expr, unary_expr, primary): Change to
exprtype.
(expr): Update. Define directly in terms of expr_no_commas
instead of using nonnull_exprlist.
(nonnull_exprlist, unary_expr, cast_expr, expr_no_commas, primary,
offsetof_member_designator, typespec_nonreserved_nonattr, init,
initval, designator, component_declarator,
component_notype_declarator, enumerator, array_declarator,
condition, exexpr, switch_statement, stmt_nocomp, stmt,
nonnull_asm_operands, ivar_declarator, receiver): Update. Don't
set C_EXP_ORIGINAL_CODE. Use TREE_NO_WARNING for assignments
where appropriate.
* c-common.h (C_EXP_ORIGINAL_CODE): Remove.
* c-common.c (c_common_truthvalue_conversion): Don't check
C_EXP_ORIGINAL_CODE.
* c-typeck.c (parser_build_binary_op): Use c_expr structures.
Don't use C_EXP_ORIGINAL_CODE.
(default_conversion, default_function_array_conversion): Don't use
C_EXP_ORIGINAL_CODE. Preserve TREE_NO_WARNING.
(internal_build_compound_expr): Merge into build_compound_expr.
(build_compound_expr): Take two operands instead of a TREE_LIST.
* objc/objc-act.c (get_super_receiver): Update calls to
build_compound_expr.
cp:
* typeck.c (build_modify_expr, build_x_modify_expr): Set
TREE_NO_WARNING on assignments with an operator other than '='.
testsuite:
* g++.dg/warn/Wparentheses-1.C, g++.dg/warn/Wparentheses-2.C,
gcc.dg/Wparentheses-10.c: New tests.
* gcc.dg/Wparentheses-5.c: Remove XFAILs.
From-SVN: r84911
2004-07-19 10:38:52 +02:00
|
|
|
|
&& ! (TREE_CODE (expr1) == CONVERT_EXPR
|
|
|
|
|
|
&& VOID_TYPE_P (TREE_TYPE (expr1))))
|
2003-07-18 02:26:51 +02:00
|
|
|
|
warning ("left-hand operand of comma expression has no effect");
|
|
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* With -Wunused, we should also warn if the left-hand operand does have
|
|
|
|
|
|
side-effects, but computes a value which is not used. For example, in
|
|
|
|
|
|
`foo() + bar(), baz()' the result of the `+' operator is not used,
|
|
|
|
|
|
so we should issue a warning. */
|
|
|
|
|
|
else if (warn_unused_value)
|
c-tree.h (struct c_expr): Define.
* c-tree.h (struct c_expr): Define.
(C_SET_EXP_ORIGINAL_CODE): Remove.
(parser_build_binary_op, build_compound_expr): Update prototypes.
* c-parse.in (%union): Add exprtype.
(FUNC_NAME): Mark as ttype.
(expr, expr_no_commas, cast_expr, unary_expr, primary): Change to
exprtype.
(expr): Update. Define directly in terms of expr_no_commas
instead of using nonnull_exprlist.
(nonnull_exprlist, unary_expr, cast_expr, expr_no_commas, primary,
offsetof_member_designator, typespec_nonreserved_nonattr, init,
initval, designator, component_declarator,
component_notype_declarator, enumerator, array_declarator,
condition, exexpr, switch_statement, stmt_nocomp, stmt,
nonnull_asm_operands, ivar_declarator, receiver): Update. Don't
set C_EXP_ORIGINAL_CODE. Use TREE_NO_WARNING for assignments
where appropriate.
* c-common.h (C_EXP_ORIGINAL_CODE): Remove.
* c-common.c (c_common_truthvalue_conversion): Don't check
C_EXP_ORIGINAL_CODE.
* c-typeck.c (parser_build_binary_op): Use c_expr structures.
Don't use C_EXP_ORIGINAL_CODE.
(default_conversion, default_function_array_conversion): Don't use
C_EXP_ORIGINAL_CODE. Preserve TREE_NO_WARNING.
(internal_build_compound_expr): Merge into build_compound_expr.
(build_compound_expr): Take two operands instead of a TREE_LIST.
* objc/objc-act.c (get_super_receiver): Update calls to
build_compound_expr.
cp:
* typeck.c (build_modify_expr, build_x_modify_expr): Set
TREE_NO_WARNING on assignments with an operator other than '='.
testsuite:
* g++.dg/warn/Wparentheses-1.C, g++.dg/warn/Wparentheses-2.C,
gcc.dg/Wparentheses-10.c: New tests.
* gcc.dg/Wparentheses-5.c: Remove XFAILs.
From-SVN: r84911
2004-07-19 10:38:52 +02:00
|
|
|
|
warn_if_unused_value (expr1, input_location);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
c-tree.h (struct c_expr): Define.
* c-tree.h (struct c_expr): Define.
(C_SET_EXP_ORIGINAL_CODE): Remove.
(parser_build_binary_op, build_compound_expr): Update prototypes.
* c-parse.in (%union): Add exprtype.
(FUNC_NAME): Mark as ttype.
(expr, expr_no_commas, cast_expr, unary_expr, primary): Change to
exprtype.
(expr): Update. Define directly in terms of expr_no_commas
instead of using nonnull_exprlist.
(nonnull_exprlist, unary_expr, cast_expr, expr_no_commas, primary,
offsetof_member_designator, typespec_nonreserved_nonattr, init,
initval, designator, component_declarator,
component_notype_declarator, enumerator, array_declarator,
condition, exexpr, switch_statement, stmt_nocomp, stmt,
nonnull_asm_operands, ivar_declarator, receiver): Update. Don't
set C_EXP_ORIGINAL_CODE. Use TREE_NO_WARNING for assignments
where appropriate.
* c-common.h (C_EXP_ORIGINAL_CODE): Remove.
* c-common.c (c_common_truthvalue_conversion): Don't check
C_EXP_ORIGINAL_CODE.
* c-typeck.c (parser_build_binary_op): Use c_expr structures.
Don't use C_EXP_ORIGINAL_CODE.
(default_conversion, default_function_array_conversion): Don't use
C_EXP_ORIGINAL_CODE. Preserve TREE_NO_WARNING.
(internal_build_compound_expr): Merge into build_compound_expr.
(build_compound_expr): Take two operands instead of a TREE_LIST.
* objc/objc-act.c (get_super_receiver): Update calls to
build_compound_expr.
cp:
* typeck.c (build_modify_expr, build_x_modify_expr): Set
TREE_NO_WARNING on assignments with an operator other than '='.
testsuite:
* g++.dg/warn/Wparentheses-1.C, g++.dg/warn/Wparentheses-2.C,
gcc.dg/Wparentheses-10.c: New tests.
* gcc.dg/Wparentheses-5.c: Remove XFAILs.
From-SVN: r84911
2004-07-19 10:38:52 +02:00
|
|
|
|
return build (COMPOUND_EXPR, TREE_TYPE (expr2), expr1, expr2);
|
2003-07-18 02:26:51 +02:00
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Build an expression representing a cast to type TYPE of expression EXPR. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
tree
|
|
|
|
|
|
build_c_cast (tree type, tree expr)
|
|
|
|
|
|
{
|
|
|
|
|
|
tree value = expr;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (type == error_mark_node || expr == error_mark_node)
|
|
|
|
|
|
return error_mark_node;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* The ObjC front-end uses TYPE_MAIN_VARIANT to tie together types differing
|
|
|
|
|
|
only in <protocol> qualifications. But when constructing cast expressions,
|
|
|
|
|
|
the protocols do matter and must be kept around. */
|
2003-09-25 03:26:01 +02:00
|
|
|
|
if (!c_dialect_objc () || !objc_is_object_ptr (type))
|
2003-07-18 02:26:51 +02:00
|
|
|
|
type = TYPE_MAIN_VARIANT (type);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (TREE_CODE (type) == ARRAY_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
error ("cast specifies array type");
|
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (TREE_CODE (type) == FUNCTION_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
error ("cast specifies function type");
|
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (type == TYPE_MAIN_VARIANT (TREE_TYPE (value)))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (pedantic)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (TREE_CODE (type) == RECORD_TYPE
|
|
|
|
|
|
|| TREE_CODE (type) == UNION_TYPE)
|
|
|
|
|
|
pedwarn ("ISO C forbids casting nonscalar to the same type");
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
}
|
|
|
|
|
|
else if (TREE_CODE (type) == UNION_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
tree field;
|
|
|
|
|
|
value = default_function_array_conversion (value);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
for (field = TYPE_FIELDS (type); field; field = TREE_CHAIN (field))
|
|
|
|
|
|
if (comptypes (TYPE_MAIN_VARIANT (TREE_TYPE (field)),
|
2004-06-13 19:14:09 +02:00
|
|
|
|
TYPE_MAIN_VARIANT (TREE_TYPE (value))))
|
2003-07-18 02:26:51 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
if (field)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
tree t;
|
|
|
|
|
|
|
|
|
|
|
|
if (pedantic)
|
|
|
|
|
|
pedwarn ("ISO C forbids casts to union type");
|
|
|
|
|
|
t = digest_init (type,
|
|
|
|
|
|
build_constructor (type,
|
|
|
|
|
|
build_tree_list (field, value)),
|
2004-07-22 01:46:20 +02:00
|
|
|
|
true, 0);
|
2003-07-18 02:26:51 +02:00
|
|
|
|
TREE_CONSTANT (t) = TREE_CONSTANT (value);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
TREE_INVARIANT (t) = TREE_INVARIANT (value);
|
2003-07-18 02:26:51 +02:00
|
|
|
|
return t;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
error ("cast to union type from type not present in union");
|
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
tree otype, ovalue;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* If casting to void, avoid the error that would come
|
|
|
|
|
|
from default_conversion in the case of a non-lvalue array. */
|
|
|
|
|
|
if (type == void_type_node)
|
|
|
|
|
|
return build1 (CONVERT_EXPR, type, value);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Convert functions and arrays to pointers,
|
|
|
|
|
|
but don't convert any other types. */
|
|
|
|
|
|
value = default_function_array_conversion (value);
|
|
|
|
|
|
otype = TREE_TYPE (value);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Optionally warn about potentially worrisome casts. */
|
* Rework fields used to describe positions of bitfields and
modify sizes to be unsigned and use HOST_WIDE_INT.
* alias.c (reg_known_value_size): Now unsigned.
* c-typeck.c (build_unary_op, case ADDR_EXPR): Use byte_position.
(really_start_incremental_init): Use bitsize_zero_node.
(push_init_level, pop_init_level, output_init_element): Likewise.
Use bitsize_unit_node and bitsize_one_node.
(output_pending_init_elements, process_init_element): Likewise.
* combine.c (combine_max_regno, reg_sign_bit_copies): Now unsigned.
(make_extraction): Position and length HOST_WIDE_INT and unsigned
HOST_WIDE_INT, respectively.
(get_pos_from_mask): Passed in value is unsigned HOST_WIDE_INT.
(num_sign_bit_copies): Returns unsigned.
BITWIDTH now unsigned; rework arithmetic.
Remove recursive call from arg to MAX.
(combine_instructions, init_reg_last_arrays): NREGS now unsigned.
(setup_incoming_promotions, can_combine_p, try_combine, simplify_set):
REGNO now unsigned.
(set_nonzero_bit_and_sign_copies): NUM now unsigned.
(find_split_point, expand_compound_operation, make_extraction): LEN
now unsigned HOST_WIDE_INT, POS now HOST_WIDE_INT.
(make_field_assignment): Likewise.
(combine_simplify_rtx): Add cast.
(expand_compound_operation): MODEWIDTH now unsigned; rework arithmetic.
(force_to_mode): WIDTH now unsigned; add cast.
(if_then_else_cond): SIZE now unsigned.
(nonzero_bits): MODE_WIDTH, RESULT_WIDTH, and WIDTH now unsigned.
(extended_count): Now returns unsigned.
(simplify_shift_const): COUNT unsigned; arg is now INPUT_COUNT.
Add SIGNED_COUNT variable; MODE_WORDS and FIRST_COUNT now unsigned.
(simplify_comparison): MODE_WIDTH now unsigned.
(update_table_tick): REGNO and ENDREGNO now unsigned; new var R.
(mark_used_regs_combine): Likewise; rework arithmetic.
(record_value_for_reg): REGNO, ENDREGNO, and I now unsigned.
(record_dead_and_set_regs, reg_dead_at_p, distribute_notes): Likewise.
(record_promoted_value): REGNO now unsigned.
(get_last_value_validate): REGNO, ENDREGNO, and J now unsigned.
(get_last_value): REGNO now unsigned.
(use_crosses_set_p): REGNO and ENDREGNO now unsigned.
(reg_dead_regno, reg_dead_endregno): Now unsigned.
(remove_death): Arg REGNO now unsigned.
(move_deaths): REGNO, DEADREGNO, DEADEND, OUREND, and I now unsigned.
(reg_bitfield_target_p): REGNO, REGNO, ENDREGNO, and ENDTREGNO
now unsigned.
* convert.c (convert_to_integer): INPREC and OUTPREC now unsigned.
* cse.c (struct qty_table_elem): FIRST_REG and LAST_REG now unsigned.
(struct cse_reg_info): REGNO now unsigned.
(cached_regno): Now unsigned.
(REGNO_QTY_VALID_P): Add cast.
(make_new_qty, make_regs_eqv, delete_reg_eqiv): Regno args unsigned.
(remove_invalid_regs): Likewise.
(remove_invalid_subreg_refs): Likewise; arg WORD also unsigned
as are variables END and I.
(get_cse_reg_info, insert): Likewise.
(mention_regs, invalidate_for_call): REGNO, ENDREGNO, and I unsigned.
(canon_hash): Likewise.
(insert_regs, lookup_for_remove): REGNO now unsigned.
(invalidate): REGNO, ENDREGNO, TREGNO, and TENDREGNO now unsigned.
New variable RN.
* dbxout.c (dbxout_parms, dbxout_reg_parms): Don't check for REGNO < 0.
* dwarf2out.c (dwarf2ou_frame_debug_expr): Remove cast.
* emit-rtl.c (subreg_realpart_p): Add cast.
(operand_subword): Arg I is now unsigned as is var PARTWORDS.
(operand_subword_force): Arg I is now unsigned.
* except.c (eh_regs): Variable I is now unsigned.
* explow.c (hard_function_value): BYTES is unsigned HOST_WIDE_INT.
* expmed.c (store_fixed_bit_field): Position is HOST_WIDE_INT;
length is unsigned HOST_WIDE_INT; likewise for internal variables.
(store_split_bit_field, extract_fixed_bit_field): Likewise.
(extract_split_bit_field, store_bit_field, extract_bit_field):
Likewise.
* expr.c (store_constructor_fields, store_constructor, store_field):
Positions are HOST_WIDE_INT and lengths are unsigned HOST_WIDE_INT.
(expand_assignment, expand_expr, expand_expr_unaligned): Likewise.
(do_jump): Likewise.
(move_by_pieces, move_by_pieces_ninsns, clear_by_pieces):
MAX_SIZE is now unsigned.
(emit_group_load): BYTEPOS is HOST_WIDE_INT; BYTELEN is unsigned.
(emit_group_store): Likewise.
(emit_move_insn): I now unsigned.
(store_constructor): Use host_integerp, tree_low_cst, and
bitsize_unit_node.
(get_inner_reference): Return bitpos and bitsize as HOST_WIDE_INT.
Rework all calculations to use trees and new fields.
* expr.h (promoted_input_arg): Regno now unsigned.
(store_bit_field, extract_bit_field): Adjust types of pos and size.
(mark_seen_cases): Arg is HOST_WIDE_INT.
* flow.c (verify_wide_reg_1): REGNO now unsigned.
* fold-const.c (decode_field_reference): Size and pos HOST_WIDE_INT;
precisions and alignments are unsigned.
(optimize_bit_field_compare, fold_truthop): Likewise.
(int_const_binop): Adjust threshold for size_int_type_wide call.
(fold_convert): Likewise.
(size_int_type_wide): Make table larger and fix thinko that only
had half of table used.
(all_ones_mask_p, fold): Precisions are unsigned.
* function.c (put_reg_info_stack): REGNO is unsigned.
(instantiate_decl): Size is HOST_WIDE_INT.
(instantiate_virtual_regs): I is unsigned.
(assign_parms): REGNO, REGNOI, and REGNOR are unsigned.
(promoted_input_arg): REGNO is unsigned.
* function.h (struct function): x_max_parm_reg is now unsigned.
* gcse.c (max_gcse_regno): Now unsigned.
(struct null_pointer_info): min_reg and max_reg now unsigned.
(lookup_set, next_set): REGNO arg now unsigned.
(compute_hash_table): REGNO and I now unsigned.
(handle_avail_expr): regnum_for_replacing now unsigned.
(cprop_insn): REGNO now unsigned.
(delete_null_pointer_checks_1): BLOCK_REG now pointer to unsigned.
* ggc-common.c (ggc_mark_tree_children, case FIELD_DECL): New case.
* global.c (set_preference): SRC_REGNO, DEST_REGNO, and I now unsigned.
* hard-reg-set.h (reg_class_size): Now unsigned.
* integrate.c (mark_stores): LAST_REG and I now unsigned; new UREGNO.
* jump.c (mark_modified_reg): I now unsigned; add cast.
(rtx_equal_for_thread_p): Add cast.
* loop.c (max_reg_before_loop): Now unsigned.
(struct_movable): REGNO now unsigned.
(try_copy_prop): REGNO arg unsigned.
(regs_match_p): XN and YN now unsigned.
(consec_sets_invariant_p, maybe_eliminate_biv): REGNO now unsigned.
(strength_reduce): Likewise; NREGS also unsigned.
(first_increment_giv, last_increment_giv unsigned): Now unsigned.
* loop.h (struct iv_class): REGNO now unsigned.
(max_reg_before_loop, first_increment_giv, last_increment_giv):
Now unsigned.
* machmode.h (mode_size, mode_unit_size): Now unsigned.
(mode_for_size, smallest_mode_for_size): Pass size as unsigned.
* optabs.c (expand_binop): I and NWORDS now unsigned.
(expand_unop): I now unsigned.
* print-tree.c (print_node): Don't print DECL_FIELD_BITPOS, but do
print DECL_FIELD_OFFSET and DECL_FIELD_BIT_OFFSET.
* real.c (significand_size): Now returns unsigned.
* real.h (significand_size): Likewise.
* regclass.c (reg_class_size): Now unsigned.
(choose_hard_reg_mode): Both operands now unsigned.
(record_reg_classes): REGNO and NR now unsigned.
(reg_scan): NREGS now unsigned.
(reg_scan_update): old_max_regno now unsigned.
(reg_scan_mark_refs): Arg MIN_REGNO and var REGNO now unsigned.
* reload.c (find_valid_class): BEST_SIZE now unsigned.
(find_dummy_reload): REGNO, NWORDS, and I now unsigned.
(hard_reg_set_here_p): Args BEG_REGNO and END_REGNO now unsigned.
Likewise for variable R.
(refers_to_regno_for_reload_p): Args REGNO and END_REGNO now unsigned,
as are variables INNER_REGNO and INNER_ENDREGNO; add new variable R.
(find_equiv_reg): Add casts.
(regno_clobbered_p): Arg REGNO now unsigned.
* reload.h (struct reload): NREGS now unsigned.
(refers_to_regno_for_reload_p): Regno args are unsigned.
(regno_clobbered_p): Likewise.
* reload1.c (reg_max_ref_width, spill_stack_slot_width): Now unsigned.
(compute_use_by_pseudos): REGNO now unsigned.
(find_reg): I and J now unsigned, new variable K, and change loop
variables accordingly; THIS_NREGS now unsigned.
(alter_reg): INHERENT_SIZE and TOTAL_SIZE now unsigned.
(spill_hard_reg): REGNO arg now unsigned; add casts.
(forget_old_reloads_1): REGNO, NR, and I now unsigned.
(mark_reload_reg_in_use): Arg REGNO and vars NREGS and I now unsigned.
(clear_reload_reg_in_use): Arg REGNO and vars NREGS, START_REGNO,
END_REGNO, CONFLICT_START, and CONFLICT_END now unsigned.
(reload_reg_free_p, reload_reg_reaches_end_p): Arg REGNO now unsigned.
(choose_reload_regs): MAX_GROUP_SIZE now unsigned.
(emit_reload_insns): REGNO now unsigned.
(reload_cse_move2add): Add cast.
(move2add_note_store): REGNO and I now unsigned; new variable ENDREGNO
and rework loop.
* resource.c (mark_referenced_resources, mark_set_resources): New
variable R; REGNO and LAST_REGNO now unsigned.
(mark_target_live_regs): J and REGNO now unsigned.
* rtl.c (mode_size, mode_unit_size): Now unsigned.
* rtl.h (union rtunion_def): New field rtuint.
(XCUINT): New macro.
(ADDRESSOF_REGNO, REGNO, SUBREG_WORD): New XCUINT.
(operand_subword, operand_subword_force): Word number is unsigned.
(choose_hard_reg_mode): Operands are unsigned.
(refers_to-regno_p, dead_or_set_regno_p): Regno arg is unsigned.
(find_regno_note, find_regno_fusage, replace_regs): Likewise.
(regno_use_in, combine_instructions, remove_death): Likewise.
(reg_scan, reg_scan_update): Likewise.
(extended_count): Return is unsigned.
* rtlanal.c (refers_to_regno_p): Args REGNO and ENDREGNO and vars I,
INNER_REGNO, and INNER_ENDREGNO now unsigned; new variable X_REGNO.
(reg_overlap_mentioned_p): REGNO and ENDREGNO now unsigned.
(reg_set_last_first_regno, reg_set_last_last_regno): Now unsigned.
(reg_reg_last_1): FIRS and LAST now unsigned.
(dead_or_set_p): REGNO, LAST_REGNO, and I now unsigned.
(dead_or_set_regno_p): Arg TEST_REGNO and vars REGNO and ENDREGNO
now unsigned.
(find_regno_note, regno_use_in): Arg REGNO now unsigned.
(find_regno_fusage): Likewise; also var REGNOTE now unsigned.
(find_reg_fusage): Variables REGNO, END_REGNO, and I now unsigned.
(replace_regs): Arg NREGS now unsigned.
* sdbout.c (sdbout_parms, sdbout_reg_parms): Don't check REGNO < 0.
* simplify-rtx.c (simplify_unary_operation): WIDTH now unsigned.
(simplify_binary_operation): Likewise.
(cselib_invalidate_regno): Arg REGNO and variables ENDREGNO, I, and
THIS_LAST now unsigned.
(cselib_record_set): Add cast.
* ssa.c (ssa_max_reg_num): Now unsigned.
(rename_block): REGNO now unsigned.
* stmt.c (expand_return): Bit positions unsigned HOST_WIDE_INT;
sizes now unsigned.
(all_cases_count): Just return -1 not -2.
COUNT, MINVAL, and LASTVAL now HOST_WIDE_INT.
Rework tests to use trees whenever possible.
Use host_integerp and tree_low_cst.
(mark_seen_cases): COUNT arg now HOST_WIDE_INT;
Likewise variable NEXT_NODE_OFFSET; XLO now unsigned.
(check_for_full_enumeration_handing): BYTES_NEEDED, I to HOST_WIDE_INT.
* stor-layout.c (mode_for_size): SIZE arg now unsigned.
(smallest_mode_for_size): Likewise.
(layout_decl): Simplify handing of a specified DECL_SIZE_UNIT.
KNOWN_ALIGN is now an alignment, so simplify code.
Don't turn off DECL_BIT_FIELD if field is BLKmode, but not type.
(start_record_layout): Renamed from new_record_layout_info.
Update to new fields.
(debug_rli, normalize_rli, rli_size_unit_so_far, rli_size_so_far):
New functions.
(place_union_field): Renamed from layout_union_field.
Update to use new fields in rli.
(place_field): Renamed from layout_field.
Major rewrite to use new fields in rli; pass alignment to layout_decl.
(finalize_record_size): Rework to use new fields in rli and handle
union.
(compute_record_mode): Rework to simplify and to use new DECL fields.
(finalize_type_size): Make rounding more consistent.
(finish_union_layout): Deleted.
(layout_type, case VOID_TYPE): Don't set TYPE_SIZE_UNIT either.
(layout_type, case RECORD_TYPE): Call new function names.
(initialize_sizetypes): Set TYPE_IS_SIZETYPE.
(set_sizetype): Set TYPE_IS_SIZETYPE earlier.
(get_best_mode): UNIT is now unsigned; remove casts.
* tree.c (bit_position): Compute from new fields.
(byte_position, int_byte_position): New functions.
(print_type_hash_statistics): Cast to remove warning.
(build_range_type): Use host_integerp and tree_low_cst to try to hash.
(build_index_type): Likewise; make subtype of sizetype.
(build_index_2_type): Pass sizetype to build_range_type.
(build_common_tree_nodes): Use size_int and bitsize_int to
initialize nodes; add bitsize_{zero,one,unit}_node.
* tree.h (DECL_FIELD_CONTEXT): Use FIELD_DECL_CHECK.
(DECL_BIT_FIELD_TYPE, DECL_QUALIFIER, DECL_FCONTEXT): Likewise.
(DECL_PACKED, DECL_BIT_FIELD): Likewise.
(DECL_FIELD_BITPOS): Deleted.
(DECL_FIELD_OFFSET, DECL_FIELD_BIT_OFFSET): New fields.
(DECL_RESULT, DECL_SAVED_INSNS): Use FUNCTION_DECL_CHECK.
(DECL_FRAME_SIZE, DECL_FUNCTION_CODE, DECL_NO_STATIC_CHAIN): Likewise.
(DECL_INLINE, DECL_BUILT_IN_NONANSI, DECL_IS_MALLOC): Likewise.
(DECL_BUILT_IN_CLASS, DECL_STATIC_CONSTRUCTOR): Likewise.
(DECL_STATIC_DESTRUCTOR, DECL_NO_CHECK_MEMORY_USAGE): Likewise.
(DECL_NO_INSTRUMENT_FUNCTION_ENTRY_EXIT, DECL_NO_LIMIT_STACK) Likewise.
(DECL_ORIGINAL_TYPE, TYPE_DECL_SUPPRESS_DEBUG): Use TYPE_DECL_CHECK.
(DECL_ARG_TYPE_AS_WRITEN, DECL_ARG_TYPE): Use PARM_DECL_CHECK.
(DECL_INCOMING_RTL, DECL_TRANSPARENT_UNION): Likewise.
(DECL_ALIGN): Adjust to new field in union.
(DECL_OFFSET_ALIGN): New field.
(DECL_ERROR_ISSUED, DECL_TOO_LATE): Use LABEL_DECL_CHECK.
(DECL_IN_TEXT_SECTION): Use VAR_DECL_CHECK.
(union tree_decl): Add struct for both aligns.
(enum tree_index): Add TI_BITSIZE_{ZERO,ONE,UNIT}.
(bitsize_zero_node, bitsize_one_node, bitsize_unit_node): Added.
(struct record_layout_info): Rework fields to have offset
alignment and byte and bit position.
(start_record_layout, place_field): Renamed from old names.
(rli_size_so_far, rli_size_unit_so_far, normalize_rli): New decls.
(byte_position, int_byte_position): Likewise.
(get_inner_reference): Change types of position and length.
* unroll.c (unroll_loop): New variable R; use for some loops.
MAX_LOCAL_REGNUM and MAXREGNUM now unsigned.
(calculate_giv_inc): Arg REGNO now unsigned.
(copy_loop_body): REGNO and SRC_REGNO now unsigned.
* varasm.c (assemble_variable): Clean up handling of size using
host_integerp and tree_low_cst.
(decode_addr_const): Use byte, not bit, position.
(output_constructor): bitpos and offsets are HOST_WIDE_INT;
use tree_low_cst and int_bit_position.
* objc/objc-act.c (build_ivar_list_initializer): Use byte_position.
* ch/actions.c (check_missing_cases): BYTES_NEEDED is HOST_WIDE_INT.
* ch/typeck.c (expand_constant_to_buffer): Use int_byte_position.
(extract_constant_from_buffer): Likewise.
* cp/class.c (build_vbase_pointer_fields): layout_field now
place_field.
(get_vfield_offset): Use byte_position.
(set_rtti_entry): Set OFFSET to ssizetype zero.
(get_binfo_offset_as_int): Deleted.
(dfs_record_base_offsets): Use tree_low_cst.
(dfs_search_base_offsets): Likewise.
(layout_nonempty_base_or_field): Reflect changes in RLI format
and call byte_position.
(layout_empty_base): Convert offset to ssizetype.
(build_base_field): use rli_size_unit_so_far.
(dfs_propagate_binfo_offsets): Do computation in proper type.
(layout_virtual_bases): Pass ssizetype to propagate_binfo_offsets.
(layout_class_type): Reflect changes in RLI names and fields.
(finish_struct_1): Set DECL_FIELD_OFFSET.
* cp/dump.c (dequeue_and_dump): Call bit_position.
* cp/expr.c (cplus_expand_constant): Use byte_position.
* cp/rtti.c (expand_class_desc): Use bitsize_one_node.
* cp/typeck.c (build_component_addr): Use byte_position and don't
special case for zero offset.
* f/com.c (ffecom_tree_canonize_ptr_): Use bitsize_zero_node.
(ffecom_tree_canonize_ref_): Likewise.
* java/class.c (make_field_value): Use byte_position.
* java/expr.c (JAVA_ARRAY_LENGTH_OFFSET): Use byte_position.
(java_array_data_offset): Likewise.
* java/java-tree.h (MAYBE_CREATE_TYPE_TYPE_LANG_SPECIFIC): Add case to
bzero call.
From-SVN: r32742
2000-03-25 19:34:13 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (warn_cast_qual
|
|
|
|
|
|
&& TREE_CODE (type) == POINTER_TYPE
|
|
|
|
|
|
&& TREE_CODE (otype) == POINTER_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
tree in_type = type;
|
|
|
|
|
|
tree in_otype = otype;
|
|
|
|
|
|
int added = 0;
|
|
|
|
|
|
int discarded = 0;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Check that the qualifiers on IN_TYPE are a superset of
|
|
|
|
|
|
the qualifiers of IN_OTYPE. The outermost level of
|
|
|
|
|
|
POINTER_TYPE nodes is uninteresting and we stop as soon
|
|
|
|
|
|
as we hit a non-POINTER_TYPE node on either type. */
|
|
|
|
|
|
do
|
|
|
|
|
|
{
|
|
|
|
|
|
in_otype = TREE_TYPE (in_otype);
|
|
|
|
|
|
in_type = TREE_TYPE (in_type);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* GNU C allows cv-qualified function types. 'const'
|
|
|
|
|
|
means the function is very pure, 'volatile' means it
|
|
|
|
|
|
can't return. We need to warn when such qualifiers
|
|
|
|
|
|
are added, not when they're taken away. */
|
|
|
|
|
|
if (TREE_CODE (in_otype) == FUNCTION_TYPE
|
|
|
|
|
|
&& TREE_CODE (in_type) == FUNCTION_TYPE)
|
|
|
|
|
|
added |= (TYPE_QUALS (in_type) & ~TYPE_QUALS (in_otype));
|
|
|
|
|
|
else
|
|
|
|
|
|
discarded |= (TYPE_QUALS (in_otype) & ~TYPE_QUALS (in_type));
|
|
|
|
|
|
}
|
|
|
|
|
|
while (TREE_CODE (in_type) == POINTER_TYPE
|
|
|
|
|
|
&& TREE_CODE (in_otype) == POINTER_TYPE);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (added)
|
|
|
|
|
|
warning ("cast adds new qualifiers to function type");
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (discarded)
|
|
|
|
|
|
/* There are qualifiers present in IN_OTYPE that are not
|
|
|
|
|
|
present in IN_TYPE. */
|
|
|
|
|
|
warning ("cast discards qualifiers from pointer target type");
|
|
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Warn about possible alignment problems. */
|
|
|
|
|
|
if (STRICT_ALIGNMENT && warn_cast_align
|
|
|
|
|
|
&& TREE_CODE (type) == POINTER_TYPE
|
|
|
|
|
|
&& TREE_CODE (otype) == POINTER_TYPE
|
|
|
|
|
|
&& TREE_CODE (TREE_TYPE (otype)) != VOID_TYPE
|
|
|
|
|
|
&& TREE_CODE (TREE_TYPE (otype)) != FUNCTION_TYPE
|
|
|
|
|
|
/* Don't warn about opaque types, where the actual alignment
|
|
|
|
|
|
restriction is unknown. */
|
|
|
|
|
|
&& !((TREE_CODE (TREE_TYPE (otype)) == UNION_TYPE
|
|
|
|
|
|
|| TREE_CODE (TREE_TYPE (otype)) == RECORD_TYPE)
|
|
|
|
|
|
&& TYPE_MODE (TREE_TYPE (otype)) == VOIDmode)
|
|
|
|
|
|
&& TYPE_ALIGN (TREE_TYPE (type)) > TYPE_ALIGN (TREE_TYPE (otype)))
|
|
|
|
|
|
warning ("cast increases required alignment of target type");
|
1997-11-02 22:19:36 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (TREE_CODE (type) == INTEGER_TYPE
|
|
|
|
|
|
&& TREE_CODE (otype) == POINTER_TYPE
|
|
|
|
|
|
&& TYPE_PRECISION (type) != TYPE_PRECISION (otype)
|
|
|
|
|
|
&& !TREE_CONSTANT (value))
|
|
|
|
|
|
warning ("cast from pointer to integer of different size");
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (warn_bad_function_cast
|
|
|
|
|
|
&& TREE_CODE (value) == CALL_EXPR
|
|
|
|
|
|
&& TREE_CODE (type) != TREE_CODE (otype))
|
|
|
|
|
|
warning ("cast does not match function type");
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (TREE_CODE (type) == POINTER_TYPE
|
|
|
|
|
|
&& TREE_CODE (otype) == INTEGER_TYPE
|
|
|
|
|
|
&& TYPE_PRECISION (type) != TYPE_PRECISION (otype)
|
|
|
|
|
|
/* Don't warn about converting any constant. */
|
|
|
|
|
|
&& !TREE_CONSTANT (value))
|
|
|
|
|
|
warning ("cast to pointer from integer of different size");
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (TREE_CODE (type) == POINTER_TYPE
|
|
|
|
|
|
&& TREE_CODE (otype) == POINTER_TYPE
|
|
|
|
|
|
&& TREE_CODE (expr) == ADDR_EXPR
|
|
|
|
|
|
&& DECL_P (TREE_OPERAND (expr, 0))
|
|
|
|
|
|
&& flag_strict_aliasing && warn_strict_aliasing
|
|
|
|
|
|
&& !VOID_TYPE_P (TREE_TYPE (type)))
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Casting the address of a decl to non void pointer. Warn
|
|
|
|
|
|
if the cast breaks type based aliasing. */
|
|
|
|
|
|
if (!COMPLETE_TYPE_P (TREE_TYPE (type)))
|
|
|
|
|
|
warning ("type-punning to incomplete type might break strict-aliasing rules");
|
2004-03-10 07:02:55 +01:00
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
HOST_WIDE_INT set1 = get_alias_set (TREE_TYPE (TREE_OPERAND (expr, 0)));
|
|
|
|
|
|
HOST_WIDE_INT set2 = get_alias_set (TREE_TYPE (type));
|
|
|
|
|
|
|
|
|
|
|
|
if (!alias_sets_conflict_p (set1, set2))
|
|
|
|
|
|
warning ("dereferencing type-punned pointer will break strict-aliasing rules");
|
|
|
|
|
|
else if (warn_strict_aliasing > 1
|
|
|
|
|
|
&& !alias_sets_might_conflict_p (set1, set2))
|
|
|
|
|
|
warning ("dereferencing type-punned pointer might break strict-aliasing rules");
|
|
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2004-01-09 21:03:58 +01:00
|
|
|
|
/* If pedantic, warn for conversions between function and object
|
|
|
|
|
|
pointer types, except for converting a null pointer constant
|
|
|
|
|
|
to function pointer type. */
|
|
|
|
|
|
if (pedantic
|
|
|
|
|
|
&& TREE_CODE (type) == POINTER_TYPE
|
|
|
|
|
|
&& TREE_CODE (otype) == POINTER_TYPE
|
|
|
|
|
|
&& TREE_CODE (TREE_TYPE (otype)) == FUNCTION_TYPE
|
|
|
|
|
|
&& TREE_CODE (TREE_TYPE (type)) != FUNCTION_TYPE)
|
|
|
|
|
|
pedwarn ("ISO C forbids conversion of function pointer to object pointer type");
|
|
|
|
|
|
|
|
|
|
|
|
if (pedantic
|
|
|
|
|
|
&& TREE_CODE (type) == POINTER_TYPE
|
|
|
|
|
|
&& TREE_CODE (otype) == POINTER_TYPE
|
|
|
|
|
|
&& TREE_CODE (TREE_TYPE (type)) == FUNCTION_TYPE
|
|
|
|
|
|
&& TREE_CODE (TREE_TYPE (otype)) != FUNCTION_TYPE
|
|
|
|
|
|
&& !(integer_zerop (value) && TREE_TYPE (otype) == void_type_node
|
|
|
|
|
|
&& TREE_CODE (expr) != NOP_EXPR))
|
|
|
|
|
|
pedwarn ("ISO C forbids conversion of object pointer to function pointer type");
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
ovalue = value;
|
|
|
|
|
|
/* Replace a nonvolatile const static variable with its value. */
|
|
|
|
|
|
if (optimize && TREE_CODE (value) == VAR_DECL)
|
|
|
|
|
|
value = decl_constant_value (value);
|
|
|
|
|
|
value = convert (type, value);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Ignore any integer overflow caused by the cast. */
|
|
|
|
|
|
if (TREE_CODE (value) == INTEGER_CST)
|
|
|
|
|
|
{
|
|
|
|
|
|
TREE_OVERFLOW (value) = TREE_OVERFLOW (ovalue);
|
2004-03-23 21:43:44 +01:00
|
|
|
|
|
|
|
|
|
|
if (TREE_CODE_CLASS (TREE_CODE (ovalue)) == 'c')
|
|
|
|
|
|
TREE_CONSTANT_OVERFLOW (value) = TREE_CONSTANT_OVERFLOW (ovalue);
|
2003-07-18 02:26:51 +02:00
|
|
|
|
}
|
|
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2004-01-20 02:38:27 +01:00
|
|
|
|
/* Don't let (void *) (FOO *) 0 be a null pointer constant. */
|
|
|
|
|
|
if (TREE_CODE (value) == INTEGER_CST
|
2003-07-18 02:26:51 +02:00
|
|
|
|
&& TREE_CODE (expr) == INTEGER_CST
|
|
|
|
|
|
&& TREE_CODE (TREE_TYPE (expr)) != INTEGER_TYPE)
|
|
|
|
|
|
value = non_lvalue (value);
|
1997-08-02 20:15:29 +02:00
|
|
|
|
|
2004-01-20 02:38:27 +01:00
|
|
|
|
/* Don't let a cast be an lvalue. */
|
|
|
|
|
|
if (value == expr)
|
2003-07-18 02:26:51 +02:00
|
|
|
|
value = non_lvalue (value);
|
1997-11-02 22:19:36 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
return value;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Interpret a cast of expression EXPR to type TYPE. */
|
|
|
|
|
|
tree
|
|
|
|
|
|
c_cast_expr (tree type, tree expr)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
int saved_wsp = warn_strict_prototypes;
|
1999-09-07 07:49:18 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* This avoids warnings about unprototyped casts on
|
|
|
|
|
|
integers. E.g. "#define SIG_DFL (void(*)())0". */
|
|
|
|
|
|
if (TREE_CODE (expr) == INTEGER_CST)
|
|
|
|
|
|
warn_strict_prototypes = 0;
|
|
|
|
|
|
type = groktypename (type);
|
|
|
|
|
|
warn_strict_prototypes = saved_wsp;
|
1999-09-07 07:49:18 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
return build_c_cast (type, expr);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
|
|
|
|
|
|
/* Build an assignment expression of lvalue LHS from value RHS.
|
|
|
|
|
|
MODIFYCODE is the code for a binary operator that we use
|
|
|
|
|
|
to combine the old value of LHS with RHS to get the new value.
|
|
|
|
|
|
Or else MODIFYCODE is NOP_EXPR meaning do a simple assignment. */
|
2003-06-22 15:41:26 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
tree
|
|
|
|
|
|
build_modify_expr (tree lhs, enum tree_code modifycode, tree rhs)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
tree result;
|
|
|
|
|
|
tree newrhs;
|
|
|
|
|
|
tree lhstype = TREE_TYPE (lhs);
|
|
|
|
|
|
tree olhstype = lhstype;
|
1997-11-02 22:19:36 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Types that aren't fully specified cannot be used in assignments. */
|
|
|
|
|
|
lhs = require_complete_type (lhs);
|
1997-11-02 22:19:36 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Avoid duplicate error messages from operands that had errors. */
|
|
|
|
|
|
if (TREE_CODE (lhs) == ERROR_MARK || TREE_CODE (rhs) == ERROR_MARK)
|
|
|
|
|
|
return error_mark_node;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Strip NON_LVALUE_EXPRs since we aren't using as an lvalue. */
|
|
|
|
|
|
/* Do not use STRIP_NOPS here. We do not want an enumerator
|
|
|
|
|
|
whose value is 0 to count as a null pointer constant. */
|
|
|
|
|
|
if (TREE_CODE (rhs) == NON_LVALUE_EXPR)
|
|
|
|
|
|
rhs = TREE_OPERAND (rhs, 0);
|
1997-11-02 22:19:36 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
newrhs = rhs;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* If a binary op has been requested, combine the old LHS value with the RHS
|
|
|
|
|
|
producing the value we should actually store into the LHS. */
|
|
|
|
|
|
|
|
|
|
|
|
if (modifycode != NOP_EXPR)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
lhs = stabilize_reference (lhs);
|
|
|
|
|
|
newrhs = build_binary_op (modifycode, lhs, rhs, 1);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (!lvalue_or_else (lhs, "invalid lvalue in assignment"))
|
|
|
|
|
|
return error_mark_node;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Warn about storing in something that is `const'. */
|
1994-09-21 20:45:25 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (TREE_READONLY (lhs) || TYPE_READONLY (lhstype)
|
|
|
|
|
|
|| ((TREE_CODE (lhstype) == RECORD_TYPE
|
|
|
|
|
|
|| TREE_CODE (lhstype) == UNION_TYPE)
|
|
|
|
|
|
&& C_TYPE_FIELDS_READONLY (lhstype)))
|
2004-03-01 00:43:29 +01:00
|
|
|
|
readonly_error (lhs, "assignment");
|
1994-09-21 20:45:25 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* If storing into a structure or union member,
|
|
|
|
|
|
it has probably been given type `int'.
|
|
|
|
|
|
Compute the type that would go with
|
|
|
|
|
|
the actual amount of storage the member occupies. */
|
1994-09-21 20:45:25 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (TREE_CODE (lhs) == COMPONENT_REF
|
|
|
|
|
|
&& (TREE_CODE (lhstype) == INTEGER_TYPE
|
|
|
|
|
|
|| TREE_CODE (lhstype) == BOOLEAN_TYPE
|
|
|
|
|
|
|| TREE_CODE (lhstype) == REAL_TYPE
|
|
|
|
|
|
|| TREE_CODE (lhstype) == ENUMERAL_TYPE))
|
|
|
|
|
|
lhstype = TREE_TYPE (get_unwidened (lhs, 0));
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* If storing in a field that is in actuality a short or narrower than one,
|
|
|
|
|
|
we must store in the field in its actual type. */
|
|
|
|
|
|
|
|
|
|
|
|
if (lhstype != TREE_TYPE (lhs))
|
|
|
|
|
|
{
|
|
|
|
|
|
lhs = copy_node (lhs);
|
|
|
|
|
|
TREE_TYPE (lhs) = lhstype;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Convert new value to destination type. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
newrhs = convert_for_assignment (lhstype, newrhs, _("assignment"),
|
|
|
|
|
|
NULL_TREE, NULL_TREE, 0);
|
|
|
|
|
|
if (TREE_CODE (newrhs) == ERROR_MARK)
|
|
|
|
|
|
return error_mark_node;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Scan operands */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
result = build (MODIFY_EXPR, lhstype, lhs, newrhs);
|
|
|
|
|
|
TREE_SIDE_EFFECTS (result) = 1;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* If we got the LHS in a different type for storing in,
|
|
|
|
|
|
convert the result back to the nominal type of LHS
|
|
|
|
|
|
so that the value we return always has the same type
|
|
|
|
|
|
as the LHS argument. */
|
1993-04-30 02:54:54 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (olhstype == TREE_TYPE (result))
|
|
|
|
|
|
return result;
|
|
|
|
|
|
return convert_for_assignment (olhstype, result, _("assignment"),
|
|
|
|
|
|
NULL_TREE, NULL_TREE, 0);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Convert value RHS to type TYPE as preparation for an assignment
|
|
|
|
|
|
to an lvalue of type TYPE.
|
|
|
|
|
|
The real work of conversion is done by `convert'.
|
|
|
|
|
|
The purpose of this function is to generate error messages
|
|
|
|
|
|
for assignments that are not allowed in C.
|
|
|
|
|
|
ERRTYPE is a string to use in error messages:
|
|
|
|
|
|
"assignment", "return", etc. If it is null, this is parameter passing
|
|
|
|
|
|
for a function call (and different error messages are output).
|
2003-06-22 15:41:26 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
FUNNAME is the name of the function being called,
|
|
|
|
|
|
as an IDENTIFIER_NODE, or null.
|
|
|
|
|
|
PARMNUM is the number of the argument, for printing in error messages. */
|
2000-01-05 20:26:23 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
static tree
|
|
|
|
|
|
convert_for_assignment (tree type, tree rhs, const char *errtype,
|
|
|
|
|
|
tree fundecl, tree funname, int parmnum)
|
|
|
|
|
|
{
|
|
|
|
|
|
enum tree_code codel = TREE_CODE (type);
|
|
|
|
|
|
tree rhstype;
|
|
|
|
|
|
enum tree_code coder;
|
2000-01-05 20:26:23 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Strip NON_LVALUE_EXPRs since we aren't using as an lvalue. */
|
|
|
|
|
|
/* Do not use STRIP_NOPS here. We do not want an enumerator
|
|
|
|
|
|
whose value is 0 to count as a null pointer constant. */
|
|
|
|
|
|
if (TREE_CODE (rhs) == NON_LVALUE_EXPR)
|
|
|
|
|
|
rhs = TREE_OPERAND (rhs, 0);
|
|
|
|
|
|
|
|
|
|
|
|
if (TREE_CODE (TREE_TYPE (rhs)) == ARRAY_TYPE
|
|
|
|
|
|
|| TREE_CODE (TREE_TYPE (rhs)) == FUNCTION_TYPE)
|
|
|
|
|
|
rhs = default_conversion (rhs);
|
|
|
|
|
|
else if (optimize && TREE_CODE (rhs) == VAR_DECL)
|
|
|
|
|
|
rhs = decl_constant_value_for_broken_optimization (rhs);
|
|
|
|
|
|
|
|
|
|
|
|
rhstype = TREE_TYPE (rhs);
|
|
|
|
|
|
coder = TREE_CODE (rhstype);
|
|
|
|
|
|
|
|
|
|
|
|
if (coder == ERROR_MARK)
|
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
|
|
|
|
|
|
if (TYPE_MAIN_VARIANT (type) == TYPE_MAIN_VARIANT (rhstype))
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
overflow_warning (rhs);
|
|
|
|
|
|
/* Check for Objective-C protocols. This will automatically
|
|
|
|
|
|
issue a warning if there are protocol violations. No need to
|
|
|
|
|
|
use the return value. */
|
|
|
|
|
|
if (c_dialect_objc ())
|
|
|
|
|
|
objc_comptypes (type, rhstype, 0);
|
|
|
|
|
|
return rhs;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
|
|
|
|
|
|
if (coder == VOID_TYPE)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
error ("void value not ignored as it ought to be");
|
|
|
|
|
|
return error_mark_node;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* A type converts to a reference to it.
|
|
|
|
|
|
This code doesn't fully support references, it's just for the
|
|
|
|
|
|
special case of va_start and va_copy. */
|
|
|
|
|
|
if (codel == REFERENCE_TYPE
|
2004-06-13 19:14:09 +02:00
|
|
|
|
&& comptypes (TREE_TYPE (type), TREE_TYPE (rhs)) == 1)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (!lvalue_p (rhs))
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
error ("cannot pass rvalue to reference parameter");
|
|
|
|
|
|
return error_mark_node;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (!c_mark_addressable (rhs))
|
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
rhs = build1 (ADDR_EXPR, build_pointer_type (TREE_TYPE (rhs)), rhs);
|
|
|
|
|
|
|
|
|
|
|
|
/* We already know that these two types are compatible, but they
|
|
|
|
|
|
may not be exactly identical. In fact, `TREE_TYPE (type)' is
|
|
|
|
|
|
likely to be __builtin_va_list and `TREE_TYPE (rhs)' is
|
|
|
|
|
|
likely to be va_list, a typedef to __builtin_va_list, which
|
|
|
|
|
|
is different enough that it will cause problems later. */
|
|
|
|
|
|
if (TREE_TYPE (TREE_TYPE (rhs)) != TREE_TYPE (type))
|
|
|
|
|
|
rhs = build1 (NOP_EXPR, build_pointer_type (TREE_TYPE (type)), rhs);
|
|
|
|
|
|
|
|
|
|
|
|
rhs = build1 (NOP_EXPR, type, rhs);
|
|
|
|
|
|
return rhs;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Some types can interconvert without explicit casts. */
|
c-common.c (c_common_type_for_mode): Build vector types on demand.
gcc/ChangeLog
2004-03-16 Paolo Bonzini <bonzini@gnu.org>
* c-common.c (c_common_type_for_mode): Build vector types on
demand.
(handle_mode_attribute): Deprecate using the mode attribute
to create vector types. Fix indentation.
(vector_type_node_list): Remove.
(handle_vector_size_attribute): Create vector types on demand.
Strip a NON_LVALUE_EXPR from the attribute if there is one.
* c-typeck.c (comptypes): Make vector types compatible if they
have the same underlying mode.
(convert_for_assignment): Use comptypes to convert between
vector types.
* tree.c (build_common_tree_nodes_2): Do not create vector types.
* config/arm/arm.c (arm_init_iwmmxt_builtins): Create necessary
vector types.
* tree.h: Remove vector types.
* config/i386/i386.c (i386_init_mmx_sse_builtins): Likewise.
* config/rs6000/rs6000.c (rs6000_init_builtins): Likewise.
(V16QI_type_node, V2SI_type_node, V2SF_type_node, V4HI_type_node,
V4SI_type_node, V4SF_type_node, V8HI_type_node): New globals.
* doc/extend.texi (Vector Types): Document how to use the
vector_size attribute to create vectors, rather than mode.
* config/arm/mmintrin.h: Use vector_size attribute, not mode.
* config/i386/emmintrin.h: Likewise.
* config/i386/mmintrin.h: Likewise.
* config/i386/xmmintrin.h: Likewise.
* config/sh/ushmedia.h: Likwise.
testsuite/ChangeLog
2004-03-16 Paolo Bonzini <bonzini@gnu.org>
* g++.dg/eh/simd-1.C: Use vector_size attribute, not mode.
* g++.dg/eh/simd-2.C: Likewise.
* g++.dg/init/array10.C: Likewise.
* gcc.c-torture/compile/simd-1.c: Likewise.
* gcc.c-torture/compile/simd-2.c: Likewise.
* gcc.c-torture/compile/simd-3.c: Likewise.
* gcc.c-torture/compile/simd-4.c: Likewise.
* gcc.c-torture/compile/simd-6.c: Likewise.
* gcc.c-torture/execute/simd-1.c: Likewise.
* gcc.c-torture/execute/simd-2.c: Likewise.
* gcc.dg/compat/vector-defs.h: Likewise.
* gcc.dg/20020531-1.c: Likewise.
* gcc.dg/altivec-3.c: Likewise.
* gcc.dg/altivec-4.c: Likewise.
* gcc.dg/altivec-varargs-1.c: Likewise.
* testsuite/gcc.dg/compat/vector-defs.h: Likewise.
* gcc.dg/i386-mmx-3.c: Likewise.
* gcc.dg/i386-sse-4.c: Likewise.
* gcc.dg/i386-sse-5.c: Likewise.
* gcc.dg/i386-sse-8.c: Likewise.
* gcc.dg/simd-1.c: Likewise.
* gcc.dg/20030218-1.c: Likewise. Plus, do not declare
__ev64_opaque__ since the machine description provides it.
Index: c-common.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/c-common.c,v
retrieving revision 1.487
diff -u -r1.487 c-common.c
--- c-common.c 26 Feb 2004 01:24:37 -0000 1.487
+++ c-common.c 10 Mar 2004 10:25:28 -0000
@@ -1874,38 +1874,12 @@
if (mode == TYPE_MODE (build_pointer_type (integer_type_node)))
return unsignedp ? make_unsigned_type (mode) : make_signed_type (mode);
- switch (mode)
+ if (VECTOR_MODE_P (mode))
{
- case V16QImode:
From-SVN: r79544
2004-03-16 21:37:31 +01:00
|
|
|
|
else if (codel == VECTOR_TYPE
|
2004-05-05 09:23:00 +02:00
|
|
|
|
&& vector_types_convertible_p (type, TREE_TYPE (rhs)))
|
2003-07-18 02:26:51 +02:00
|
|
|
|
return convert (type, rhs);
|
|
|
|
|
|
/* Arithmetic types all interconvert, and enum is treated like int. */
|
|
|
|
|
|
else if ((codel == INTEGER_TYPE || codel == REAL_TYPE
|
|
|
|
|
|
|| codel == ENUMERAL_TYPE || codel == COMPLEX_TYPE
|
|
|
|
|
|
|| codel == BOOLEAN_TYPE)
|
|
|
|
|
|
&& (coder == INTEGER_TYPE || coder == REAL_TYPE
|
|
|
|
|
|
|| coder == ENUMERAL_TYPE || coder == COMPLEX_TYPE
|
|
|
|
|
|
|| coder == BOOLEAN_TYPE))
|
|
|
|
|
|
return convert_and_check (type, rhs);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Conversion to a transparent union from its member types.
|
|
|
|
|
|
This applies only to function arguments. */
|
|
|
|
|
|
else if (codel == UNION_TYPE && TYPE_TRANSPARENT_UNION (type) && ! errtype)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
tree memb_types;
|
|
|
|
|
|
tree marginal_memb_type = 0;
|
|
|
|
|
|
|
|
|
|
|
|
for (memb_types = TYPE_FIELDS (type); memb_types;
|
|
|
|
|
|
memb_types = TREE_CHAIN (memb_types))
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
tree memb_type = TREE_TYPE (memb_types);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (comptypes (TYPE_MAIN_VARIANT (memb_type),
|
2004-06-13 19:14:09 +02:00
|
|
|
|
TYPE_MAIN_VARIANT (rhstype)))
|
2003-07-18 02:26:51 +02:00
|
|
|
|
break;
|
1993-02-02 05:40:04 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (TREE_CODE (memb_type) != POINTER_TYPE)
|
|
|
|
|
|
continue;
|
2003-06-22 15:41:26 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (coder == POINTER_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
tree ttl = TREE_TYPE (memb_type);
|
|
|
|
|
|
tree ttr = TREE_TYPE (rhstype);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Any non-function converts to a [const][volatile] void *
|
|
|
|
|
|
and vice versa; otherwise, targets must be the same.
|
|
|
|
|
|
Meanwhile, the lhs target must have all the qualifiers of
|
|
|
|
|
|
the rhs. */
|
|
|
|
|
|
if (VOID_TYPE_P (ttl) || VOID_TYPE_P (ttr)
|
|
|
|
|
|
|| comp_target_types (memb_type, rhstype, 0))
|
|
|
|
|
|
{
|
|
|
|
|
|
/* If this type won't generate any warnings, use it. */
|
|
|
|
|
|
if (TYPE_QUALS (ttl) == TYPE_QUALS (ttr)
|
|
|
|
|
|
|| ((TREE_CODE (ttr) == FUNCTION_TYPE
|
|
|
|
|
|
&& TREE_CODE (ttl) == FUNCTION_TYPE)
|
|
|
|
|
|
? ((TYPE_QUALS (ttl) | TYPE_QUALS (ttr))
|
|
|
|
|
|
== TYPE_QUALS (ttr))
|
|
|
|
|
|
: ((TYPE_QUALS (ttl) | TYPE_QUALS (ttr))
|
|
|
|
|
|
== TYPE_QUALS (ttl))))
|
|
|
|
|
|
break;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Keep looking for a better type, but remember this one. */
|
|
|
|
|
|
if (! marginal_memb_type)
|
|
|
|
|
|
marginal_memb_type = memb_type;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
1993-01-25 04:40:07 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Can convert integer zero to any pointer type. */
|
|
|
|
|
|
if (integer_zerop (rhs)
|
|
|
|
|
|
|| (TREE_CODE (rhs) == NOP_EXPR
|
|
|
|
|
|
&& integer_zerop (TREE_OPERAND (rhs, 0))))
|
|
|
|
|
|
{
|
|
|
|
|
|
rhs = null_pointer_node;
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (memb_types || marginal_memb_type)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (! memb_types)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* We have only a marginally acceptable member type;
|
|
|
|
|
|
it needs a warning. */
|
|
|
|
|
|
tree ttl = TREE_TYPE (marginal_memb_type);
|
|
|
|
|
|
tree ttr = TREE_TYPE (rhstype);
|
2001-05-06 18:38:56 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Const and volatile mean something different for function
|
|
|
|
|
|
types, so the usual warnings are not appropriate. */
|
|
|
|
|
|
if (TREE_CODE (ttr) == FUNCTION_TYPE
|
|
|
|
|
|
&& TREE_CODE (ttl) == FUNCTION_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Because const and volatile on functions are
|
|
|
|
|
|
restrictions that say the function will not do
|
|
|
|
|
|
certain things, it is okay to use a const or volatile
|
|
|
|
|
|
function where an ordinary one is wanted, but not
|
|
|
|
|
|
vice-versa. */
|
|
|
|
|
|
if (TYPE_QUALS (ttl) & ~TYPE_QUALS (ttr))
|
|
|
|
|
|
warn_for_assignment ("%s makes qualified function pointer from unqualified",
|
|
|
|
|
|
errtype, funname, parmnum);
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (TYPE_QUALS (ttr) & ~TYPE_QUALS (ttl))
|
|
|
|
|
|
warn_for_assignment ("%s discards qualifiers from pointer target type",
|
|
|
|
|
|
errtype, funname,
|
|
|
|
|
|
parmnum);
|
|
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (pedantic && ! DECL_IN_SYSTEM_HEADER (fundecl))
|
|
|
|
|
|
pedwarn ("ISO C prohibits argument conversion to union type");
|
1995-03-31 01:21:34 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
return build1 (NOP_EXPR, type, rhs);
|
|
|
|
|
|
}
|
1995-03-31 01:21:34 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Conversions among pointers */
|
|
|
|
|
|
else if ((codel == POINTER_TYPE || codel == REFERENCE_TYPE)
|
|
|
|
|
|
&& (coder == codel))
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
tree ttl = TREE_TYPE (type);
|
|
|
|
|
|
tree ttr = TREE_TYPE (rhstype);
|
|
|
|
|
|
bool is_opaque_pointer;
|
2003-09-25 03:26:01 +02:00
|
|
|
|
int target_cmp = 0; /* Cache comp_target_types () result. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Opaque pointers are treated like void pointers. */
|
alias.c, [...]: Replace calls via (*targetm.foo) () with targetm.foo ().
* alias.c, attribs.c, bt-load.c, builtins.c, c-common.c,
c-decl.c, c-objc-common.c, c-typeck.c, calls.c, cfglayout.c,
cse.c, dbxout.c, dwarf2out.c, except.c, final.c,
haifa-sched.c, integrate.c, passes.c, rtlanal.c, sched-rgn.c,
sched-vis.c, simplify-rtx.c, stor-layout.c, tree.c, varasm.c,
vmsdbgout.c: Replace calls via (*targetm.foo) () with
targetm.foo ().
From-SVN: r79729
2004-03-20 05:52:59 +01:00
|
|
|
|
is_opaque_pointer = (targetm.vector_opaque_p (type)
|
|
|
|
|
|
|| targetm.vector_opaque_p (rhstype))
|
2003-07-18 02:26:51 +02:00
|
|
|
|
&& TREE_CODE (ttl) == VECTOR_TYPE
|
|
|
|
|
|
&& TREE_CODE (ttr) == VECTOR_TYPE;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Any non-function converts to a [const][volatile] void *
|
|
|
|
|
|
and vice versa; otherwise, targets must be the same.
|
|
|
|
|
|
Meanwhile, the lhs target must have all the qualifiers of the rhs. */
|
|
|
|
|
|
if (VOID_TYPE_P (ttl) || VOID_TYPE_P (ttr)
|
2003-09-25 03:26:01 +02:00
|
|
|
|
|| (target_cmp = comp_target_types (type, rhstype, 0))
|
2003-07-18 02:26:51 +02:00
|
|
|
|
|| is_opaque_pointer
|
|
|
|
|
|
|| (c_common_unsigned_type (TYPE_MAIN_VARIANT (ttl))
|
|
|
|
|
|
== c_common_unsigned_type (TYPE_MAIN_VARIANT (ttr))))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (pedantic
|
|
|
|
|
|
&& ((VOID_TYPE_P (ttl) && TREE_CODE (ttr) == FUNCTION_TYPE)
|
|
|
|
|
|
||
|
|
|
|
|
|
(VOID_TYPE_P (ttr)
|
|
|
|
|
|
/* Check TREE_CODE to catch cases like (void *) (char *) 0
|
|
|
|
|
|
which are not ANSI null ptr constants. */
|
|
|
|
|
|
&& (!integer_zerop (rhs) || TREE_CODE (rhs) == NOP_EXPR)
|
|
|
|
|
|
&& TREE_CODE (ttl) == FUNCTION_TYPE)))
|
|
|
|
|
|
warn_for_assignment ("ISO C forbids %s between function pointer and `void *'",
|
|
|
|
|
|
errtype, funname, parmnum);
|
|
|
|
|
|
/* Const and volatile mean something different for function types,
|
|
|
|
|
|
so the usual warnings are not appropriate. */
|
|
|
|
|
|
else if (TREE_CODE (ttr) != FUNCTION_TYPE
|
|
|
|
|
|
&& TREE_CODE (ttl) != FUNCTION_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (TYPE_QUALS (ttr) & ~TYPE_QUALS (ttl))
|
|
|
|
|
|
warn_for_assignment ("%s discards qualifiers from pointer target type",
|
|
|
|
|
|
errtype, funname, parmnum);
|
|
|
|
|
|
/* If this is not a case of ignoring a mismatch in signedness,
|
|
|
|
|
|
no warning. */
|
|
|
|
|
|
else if (VOID_TYPE_P (ttl) || VOID_TYPE_P (ttr)
|
2003-09-25 03:26:01 +02:00
|
|
|
|
|| target_cmp)
|
2003-07-18 02:26:51 +02:00
|
|
|
|
;
|
|
|
|
|
|
/* If there is a mismatch, do warn. */
|
2004-07-24 09:32:15 +02:00
|
|
|
|
else
|
2003-07-18 02:26:51 +02:00
|
|
|
|
warn_for_assignment ("pointer targets in %s differ in signedness",
|
|
|
|
|
|
errtype, funname, parmnum);
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (TREE_CODE (ttl) == FUNCTION_TYPE
|
|
|
|
|
|
&& TREE_CODE (ttr) == FUNCTION_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Because const and volatile on functions are restrictions
|
|
|
|
|
|
that say the function will not do certain things,
|
|
|
|
|
|
it is okay to use a const or volatile function
|
|
|
|
|
|
where an ordinary one is wanted, but not vice-versa. */
|
|
|
|
|
|
if (TYPE_QUALS (ttl) & ~TYPE_QUALS (ttr))
|
|
|
|
|
|
warn_for_assignment ("%s makes qualified function pointer from unqualified",
|
|
|
|
|
|
errtype, funname, parmnum);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
warn_for_assignment ("%s from incompatible pointer type",
|
|
|
|
|
|
errtype, funname, parmnum);
|
|
|
|
|
|
return convert (type, rhs);
|
|
|
|
|
|
}
|
2003-10-04 20:02:32 +02:00
|
|
|
|
else if (codel == POINTER_TYPE && coder == ARRAY_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
error ("invalid use of non-lvalue array");
|
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else if (codel == POINTER_TYPE && coder == INTEGER_TYPE)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* An explicit constant 0 can convert to a pointer,
|
|
|
|
|
|
or one that results from arithmetic, even including
|
|
|
|
|
|
a cast to integer type. */
|
|
|
|
|
|
if (! (TREE_CODE (rhs) == INTEGER_CST && integer_zerop (rhs))
|
|
|
|
|
|
&&
|
|
|
|
|
|
! (TREE_CODE (rhs) == NOP_EXPR
|
|
|
|
|
|
&& TREE_CODE (TREE_TYPE (rhs)) == INTEGER_TYPE
|
|
|
|
|
|
&& TREE_CODE (TREE_OPERAND (rhs, 0)) == INTEGER_CST
|
|
|
|
|
|
&& integer_zerop (TREE_OPERAND (rhs, 0))))
|
|
|
|
|
|
warn_for_assignment ("%s makes pointer from integer without a cast",
|
|
|
|
|
|
errtype, funname, parmnum);
|
2003-12-23 06:26:41 +01:00
|
|
|
|
|
|
|
|
|
|
return convert (type, rhs);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else if (codel == INTEGER_TYPE && coder == POINTER_TYPE)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
warn_for_assignment ("%s makes integer from pointer without a cast",
|
|
|
|
|
|
errtype, funname, parmnum);
|
|
|
|
|
|
return convert (type, rhs);
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (codel == BOOLEAN_TYPE && coder == POINTER_TYPE)
|
|
|
|
|
|
return convert (type, rhs);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (!errtype)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (funname)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
tree selector = objc_message_selector ();
|
1992-06-29 06:56:04 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (selector && parmnum > 2)
|
|
|
|
|
|
error ("incompatible type for argument %d of `%s'",
|
|
|
|
|
|
parmnum - 2, IDENTIFIER_POINTER (selector));
|
|
|
|
|
|
else
|
|
|
|
|
|
error ("incompatible type for argument %d of `%s'",
|
|
|
|
|
|
parmnum, IDENTIFIER_POINTER (funname));
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else
|
|
|
|
|
|
error ("incompatible type for argument %d of indirect function call",
|
|
|
|
|
|
parmnum);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
|
|
|
|
|
else
|
2003-07-18 02:26:51 +02:00
|
|
|
|
error ("incompatible types in %s", errtype);
|
1993-02-06 00:00:46 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
}
|
1993-02-06 00:00:46 +01:00
|
|
|
|
|
2003-11-12 20:53:17 +01:00
|
|
|
|
/* Convert VALUE for assignment into inlined parameter PARM. ARGNUM
|
|
|
|
|
|
is used for error and waring reporting and indicates which argument
|
|
|
|
|
|
is being processed. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
tree
|
2003-11-12 20:53:17 +01:00
|
|
|
|
c_convert_parm_for_inlining (tree parm, tree value, tree fn, int argnum)
|
2003-07-18 02:26:51 +02:00
|
|
|
|
{
|
|
|
|
|
|
tree ret, type;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* If FN was prototyped, the value has been converted already
|
|
|
|
|
|
in convert_arguments. */
|
|
|
|
|
|
if (! value || TYPE_ARG_TYPES (TREE_TYPE (fn)))
|
|
|
|
|
|
return value;
|
1998-05-06 01:18:02 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
type = TREE_TYPE (parm);
|
|
|
|
|
|
ret = convert_for_assignment (type, value,
|
|
|
|
|
|
(char *) 0 /* arg passing */, fn,
|
2003-11-12 20:53:17 +01:00
|
|
|
|
DECL_NAME (fn), argnum);
|
targhooks.c: New file.
* targhooks.c: New file.
* targhooks.h: New file.
* Makefile.in: Add targhooks.o support.
(function.o): Depend on$(TARGET_H).
(stmt.o): Likewise.
(combine.o): Depend on $(TREE_H) and $(TARGET_H).
* builtins.c (apply_args_size, expand_builtin_apply_args_1,
expand_builtin_apply): Convert to calls.struct_value_rtx hook.
(expand_builtin_saveregs): Convert to
calls.expand_builtin_saveregs hook.
* c-decl.c (start_decl): Handle new calls.promote_prototypes hook
here, instead of ...
(get_parm_info) ... here.
(store_parm_decls_oldstyle): Convert to calls.promote_prototypes
hook.
(finish_function): Handle calls.promote_prototypes hook here too.
* c-typeck.c (convert_arguments): Convert to
calls.promote_prototypes hook.
(c_convert_parm_for_inlining): Likewise.
* calls.c (initialize_argument_information): Convert to
calls.promote_function_args hook.
(expand_call): Convert to calls.struct_value_rtx,
calls.strict_argument_naming,
calls.pretend_outgoing_varargs_named, and
calls.promote_function_return hooks. Pass fndecl to
aggregate_value_p. Initialize CUMULATIVE_ARGS before calling
hooks, so they can use that.
(emit_library_call_value_1): Likewise.
* combine.c (setup_incoming_promotions): Convert to
calls.promote_function_args hook.
* emit-rtl.c: Convert to calls.struct_value_rtx hook.
* expr.c (expand_assignment): Pass call to aggregate_value_p.
(expand_expr): Likewise.
* expr.h: Remove support for SETUP_INCOMING_VARARGS,
STRICT_ARGUMENT_NAMING, PRETEND_OUTGOING_VARARGS_NAMED,
RETURN_IN_MEMORY macro defaults.
* final.c (profile_function): Convert to calls.struct_value_rtx
hook.
* function.c (aggregate_value_p): Accept function type tree as
second parameter; try to deduce fntype from it. Convert to
calls.return_in_memory hook.
(assign_parms): Convert to calls.setup_incoming_varargs,
calls.strict_argument_naming, calls.promote_function_args,
calls.pretend_outgoing_varargs_named hooks. Pass fndecl to
aggregate_value_p.
(expand_function_start): Likewise. Convert to
calls.struct_value_rtx hook.
(expand_function_end): Convert to calls.promote_function_return hook.
(allocate_struct_function): Pass fndecl to aggregate_value_p.
* hard-reg-set.h: Update comments to new hook names.
* integrate.c (expand_inline_function): Pass fndecl to aggregate_value_p.
* reg-stack.c (stack_result): Likewise.
* rtl.h (struct_value_rtx, struct_value_incoming_rtx): Delete.
* stmt.c (expand_value_return): Convert to
calls.promote_function_return hook.
* target-def.h: Add TARGET_PROMOTE_FUNCTION_ARGS,
TARGET_PROMOTE_FUNCTION_RETURN, TARGET_PROMOTE_PROTOTYPES,
TARGET_STRUCT_VALUE_RTX, TARGET_RETURN_IN_MEMORY,
TARGET_EXPAND_BUILTIN_SAVEREGS, TARGET_SETUP_INCOMING_VARARGS,
TARGET_STRICT_ARGUMENT_NAMING,
TARGET_PRETEND_OUTGOING_VARARGS_NAMED, and TARGET_CALLS.
* target.h: Likewise.
* tree.h (aggregate_value_p): Also takes a tree to deduce function
attributes from (for target hooks).
* doc/tm.texi (PROMOTE_FUNCTION_ARGS, PROMOTE_FUNCTION_RETURN,
PROMOTE_PROTOTYPES, RETURN_IN_MEMORY, STRUCT_VALUE_REGNUM,
STRUCT_VALUE, STRUCT_VALUE_INCOMING_REGNUM, STRUCT_VALUE_INCOMING,
EXPAND_BUILTIN_SAVEREGS, SETUP_INCOMING_VARARGS,
STRICT_ARGUMENT_NAMING, PRETEND_OUTGOING_VARARGS_NAMED): Convert
to hooks.
* config/alpha/alpha.c (alpha_output_mi_thunk_osf): Pass function
to aggregate_value_p.
* config/arm/arm.c (arm_init_cumulative_args,
arm_output_mi_thunk): Likewise.
* config/i386/i386.c (ix86_return_pops_args, x86_this_parameter):
Likewise.
* config/mips/mips.c (mips_save_reg_p, mips_expand_prologue,
mips_can_use_return_insn): Likewise.
* config/rs6000/rs6000.c (rs6000_output_mi_thunk): Likewise.
* config/s390/s390.c (s390_output_mi_thunk): Likewise.
* config/sparc/sparc.c (sparc_output_mi_thunk): Pass function to
aggregate_value_p.
* config/story16/stormy16.c (xstormy16_asm_output_mi_thunk): Pass
function to aggregate_value_p.
* objc/objc-act.c (generate_struct_by_value_array): Pass NULL to
aggregate_value_p.
* config/sh/sh-protos.h (sh_builtin_saveregs): Remove.
(sh_attr_renesas_p, sh_cfun_attr_renesas_p, sh_function_arg,
sh_function_arg_advance, sh_pass_in_reg_p): New. * config/sh/sh.c
(sh_handle_renesas_attribute, sh_promote_prototypes,
sh_struct_value_rtx, sh_return_in_memory, sh_builtin_saveregs,
sh_setup_incoming_varargs, sh_strict_argument_naming,
sh_pretend_outgoing_varargs_named): New decls.
(targetm): Add new hooks.
(calc_live_regs): Save MACL and MACH if the function has the
renesas attribute.
(sh_expand_prologue): Support renesas attribute.
(sh_builtin_saveregs): Make static.
(sh_build_va_list): Support renesas attribute.
(sh_va_start): Likewise.
(sh_va_arg): Likewise.
(sh_promote_prototypes): New.
(sh_function_arg): New, moved from sh.h. Support renesas
attribute.
(sh_function_arg_advance): Likewise.
(sh_return_in_memory): Likewise.
(sh_strict_argument_naming): Likewise.
(sh_pretend_outgoing_varargs_named): Likewise.
(sh_struct_value_rtx): New.
(sh_attribute): Add renesas attribute.
(sh_handle_renesas_attribute): New.
(sh_attr_renesas_p, sh_cfun_attr_renesas_p): New.
(sh_ms_bitfield_layout_p): Support renesas attribute also.
(sh_output_mi_thunk): Pass function to aggregate_value_p. *
config/sh/sh.h (TARGET_SWITCHES): Add -mrenesas as an alias for
-mhitachi.
(STRUCT_VALUE_REGNUM, STRUCT_VALUE, RETURN_IN_MEMORY): Moved to
target hooks.
(sh_args): Add renesas_abi flag.
(INIT_CUMULATIVE_ARGS): Set it. Pass fndecl to aggregate_value_p.
(FUNCTION_ARG_ADVANCE, FUNCTION_ARG): Move to sh.c.
(PASS_IN_REG_P): Support renesas attribute. Pass DF and TF on the
stack for the renesas abi.
(STRICT_ARGUMENT_NAMING, PRETEND_OUTGOING_VARARGS_NAMED,
SETUP_INCOMING_VARARGS, EXPAND_BUILTIN_SAVEREGS,
PROMOTE_PROTOTYPES): Moved to sh.c. * config/sh/sh.md (call): Set
call cookie to indicate renesas calls.
* decl.c (finish_function): Pass fndecl to aggregate_value_p.
* misc.c (default_pass_by_ref): Convert to calls.return_in_memory
hook.
From-SVN: r71048
2003-09-04 05:18:05 +02:00
|
|
|
|
if (targetm.calls.promote_prototypes (TREE_TYPE (fn))
|
2003-07-18 02:26:51 +02:00
|
|
|
|
&& INTEGRAL_TYPE_P (type)
|
|
|
|
|
|
&& (TYPE_PRECISION (type) < TYPE_PRECISION (integer_type_node)))
|
|
|
|
|
|
ret = default_conversion (ret);
|
|
|
|
|
|
return ret;
|
|
|
|
|
|
}
|
2002-02-04 18:01:30 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Print a warning using MSGID.
|
|
|
|
|
|
It gets OPNAME as its one parameter.
|
|
|
|
|
|
if OPNAME is null and ARGNUM is 0, it is replaced by "passing arg of `FUNCTION'".
|
|
|
|
|
|
Otherwise if OPNAME is null, it is replaced by "passing arg ARGNUM of `FUNCTION'".
|
|
|
|
|
|
FUNCTION and ARGNUM are handled specially if we are building an
|
|
|
|
|
|
Objective-C selector. */
|
2000-01-12 18:35:41 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
static void
|
|
|
|
|
|
warn_for_assignment (const char *msgid, const char *opname, tree function,
|
|
|
|
|
|
int argnum)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (opname == 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
tree selector = objc_message_selector ();
|
|
|
|
|
|
char * new_opname;
|
2002-02-04 18:01:30 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (selector && argnum > 2)
|
|
|
|
|
|
{
|
|
|
|
|
|
function = selector;
|
|
|
|
|
|
argnum -= 2;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (argnum == 0)
|
2002-10-01 21:11:07 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (function)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Function name is known; supply it. */
|
|
|
|
|
|
const char *const argstring = _("passing arg of `%s'");
|
2003-07-19 16:47:15 +02:00
|
|
|
|
new_opname = alloca (IDENTIFIER_LENGTH (function)
|
|
|
|
|
|
+ strlen (argstring) + 1 + 1);
|
2003-07-18 02:26:51 +02:00
|
|
|
|
sprintf (new_opname, argstring,
|
|
|
|
|
|
IDENTIFIER_POINTER (function));
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Function name unknown (call through ptr). */
|
|
|
|
|
|
const char *const argnofun = _("passing arg of pointer to function");
|
2003-07-19 16:47:15 +02:00
|
|
|
|
new_opname = alloca (strlen (argnofun) + 1 + 1);
|
2003-07-18 02:26:51 +02:00
|
|
|
|
sprintf (new_opname, argnofun);
|
|
|
|
|
|
}
|
2002-10-01 21:11:07 +02:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else if (function)
|
1993-07-02 03:26:01 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Function name is known; supply it. */
|
|
|
|
|
|
const char *const argstring = _("passing arg %d of `%s'");
|
2003-07-19 16:47:15 +02:00
|
|
|
|
new_opname = alloca (IDENTIFIER_LENGTH (function)
|
|
|
|
|
|
+ strlen (argstring) + 1 + 25 /*%d*/ + 1);
|
2003-07-18 02:26:51 +02:00
|
|
|
|
sprintf (new_opname, argstring, argnum,
|
|
|
|
|
|
IDENTIFIER_POINTER (function));
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Function name unknown (call through ptr); just give arg number. */
|
|
|
|
|
|
const char *const argnofun = _("passing arg %d of pointer to function");
|
2003-07-19 16:47:15 +02:00
|
|
|
|
new_opname = alloca (strlen (argnofun) + 1 + 25 /*%d*/ + 1);
|
2003-07-18 02:26:51 +02:00
|
|
|
|
sprintf (new_opname, argnofun, argnum);
|
1993-07-02 03:26:01 +02:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
opname = new_opname;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
pedwarn (msgid, opname);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
|
|
|
|
|
|
/* If VALUE is a compound expr all of whose expressions are constant, then
|
|
|
|
|
|
return its value. Otherwise, return error_mark_node.
|
2001-05-11 08:38:48 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
This is for handling COMPOUND_EXPRs as initializer elements
|
|
|
|
|
|
which is allowed with a warning when -pedantic is specified. */
|
2001-05-11 08:38:48 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
static tree
|
|
|
|
|
|
valid_compound_expr_initializer (tree value, tree endtype)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (TREE_CODE (value) == COMPOUND_EXPR)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (valid_compound_expr_initializer (TREE_OPERAND (value, 0), endtype)
|
|
|
|
|
|
== error_mark_node)
|
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
return valid_compound_expr_initializer (TREE_OPERAND (value, 1),
|
|
|
|
|
|
endtype);
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (! TREE_CONSTANT (value)
|
|
|
|
|
|
&& ! initializer_constant_valid_p (value, endtype))
|
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
else
|
|
|
|
|
|
return value;
|
2001-05-11 08:38:48 +02:00
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Perform appropriate conversions on the initial value of a variable,
|
|
|
|
|
|
store it in the declaration DECL,
|
|
|
|
|
|
and print any error messages that are appropriate.
|
|
|
|
|
|
If the init is invalid, store an ERROR_MARK. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
void
|
|
|
|
|
|
store_init_value (tree decl, tree init)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
tree value, type;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* If variable's type was invalidly declared, just ignore it. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
type = TREE_TYPE (decl);
|
|
|
|
|
|
if (TREE_CODE (type) == ERROR_MARK)
|
|
|
|
|
|
return;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Digest the specified initializer into an expression. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2004-07-22 01:46:20 +02:00
|
|
|
|
value = digest_init (type, init, true, TREE_STATIC (decl));
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Store the expression if valid; else report error. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (warn_traditional && !in_system_header
|
|
|
|
|
|
&& AGGREGATE_TYPE_P (TREE_TYPE (decl)) && ! TREE_STATIC (decl))
|
|
|
|
|
|
warning ("traditional C rejects automatic aggregate initialization");
|
2003-06-22 15:41:26 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
DECL_INITIAL (decl) = value;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* ANSI wants warnings about out-of-range constant initializers. */
|
|
|
|
|
|
STRIP_TYPE_NOPS (value);
|
|
|
|
|
|
constant_expression_warning (value);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Check if we need to set array size from compound literal size. */
|
|
|
|
|
|
if (TREE_CODE (type) == ARRAY_TYPE
|
|
|
|
|
|
&& TYPE_DOMAIN (type) == 0
|
|
|
|
|
|
&& value != error_mark_node)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
tree inside_init = init;
|
|
|
|
|
|
|
|
|
|
|
|
if (TREE_CODE (init) == NON_LVALUE_EXPR)
|
|
|
|
|
|
inside_init = TREE_OPERAND (init, 0);
|
|
|
|
|
|
inside_init = fold (inside_init);
|
|
|
|
|
|
|
|
|
|
|
|
if (TREE_CODE (inside_init) == COMPOUND_LITERAL_EXPR)
|
|
|
|
|
|
{
|
|
|
|
|
|
tree decl = COMPOUND_LITERAL_EXPR_DECL (inside_init);
|
|
|
|
|
|
|
|
|
|
|
|
if (TYPE_DOMAIN (TREE_TYPE (decl)))
|
|
|
|
|
|
{
|
|
|
|
|
|
/* For int foo[] = (int [3]){1}; we need to set array size
|
|
|
|
|
|
now since later on array initializer will be just the
|
|
|
|
|
|
brace enclosed list of the compound literal. */
|
|
|
|
|
|
TYPE_DOMAIN (type) = TYPE_DOMAIN (TREE_TYPE (decl));
|
|
|
|
|
|
layout_type (type);
|
|
|
|
|
|
layout_decl (decl, 0);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Methods for storing and printing names for error messages. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Implement a spelling stack that allows components of a name to be pushed
|
|
|
|
|
|
and popped. Each element on the stack is this structure. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
struct spelling
|
|
|
|
|
|
{
|
|
|
|
|
|
int kind;
|
|
|
|
|
|
union
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
int i;
|
|
|
|
|
|
const char *s;
|
|
|
|
|
|
} u;
|
|
|
|
|
|
};
|
2003-06-22 15:41:26 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
#define SPELLING_STRING 1
|
|
|
|
|
|
#define SPELLING_MEMBER 2
|
|
|
|
|
|
#define SPELLING_BOUNDS 3
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
static struct spelling *spelling; /* Next stack element (unused). */
|
|
|
|
|
|
static struct spelling *spelling_base; /* Spelling stack base. */
|
|
|
|
|
|
static int spelling_size; /* Size of the spelling stack. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Macros to save and restore the spelling stack around push_... functions.
|
|
|
|
|
|
Alternative to SAVE_SPELLING_STACK. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
#define SPELLING_DEPTH() (spelling - spelling_base)
|
|
|
|
|
|
#define RESTORE_SPELLING_DEPTH(DEPTH) (spelling = spelling_base + (DEPTH))
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Push an element on the spelling stack with type KIND and assign VALUE
|
|
|
|
|
|
to MEMBER. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
#define PUSH_SPELLING(KIND, VALUE, MEMBER) \
|
|
|
|
|
|
{ \
|
|
|
|
|
|
int depth = SPELLING_DEPTH (); \
|
|
|
|
|
|
\
|
|
|
|
|
|
if (depth >= spelling_size) \
|
|
|
|
|
|
{ \
|
|
|
|
|
|
spelling_size += 10; \
|
|
|
|
|
|
if (spelling_base == 0) \
|
2003-07-19 16:47:15 +02:00
|
|
|
|
spelling_base = xmalloc (spelling_size * sizeof (struct spelling)); \
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else \
|
2003-07-19 16:47:15 +02:00
|
|
|
|
spelling_base = xrealloc (spelling_base, \
|
|
|
|
|
|
spelling_size * sizeof (struct spelling)); \
|
2003-07-18 02:26:51 +02:00
|
|
|
|
RESTORE_SPELLING_DEPTH (depth); \
|
|
|
|
|
|
} \
|
|
|
|
|
|
\
|
|
|
|
|
|
spelling->kind = (KIND); \
|
|
|
|
|
|
spelling->MEMBER = (VALUE); \
|
|
|
|
|
|
spelling++; \
|
|
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Push STRING on the stack. Printed literally. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
static void
|
|
|
|
|
|
push_string (const char *string)
|
|
|
|
|
|
{
|
|
|
|
|
|
PUSH_SPELLING (SPELLING_STRING, string, u.s);
|
|
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Push a member name on the stack. Printed as '.' STRING. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
static void
|
|
|
|
|
|
push_member_name (tree decl)
|
|
|
|
|
|
{
|
|
|
|
|
|
const char *const string
|
|
|
|
|
|
= DECL_NAME (decl) ? IDENTIFIER_POINTER (DECL_NAME (decl)) : "<anonymous>";
|
|
|
|
|
|
PUSH_SPELLING (SPELLING_MEMBER, string, u.s);
|
|
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Push an array bounds on the stack. Printed as [BOUNDS]. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
static void
|
|
|
|
|
|
push_array_bounds (int bounds)
|
|
|
|
|
|
{
|
|
|
|
|
|
PUSH_SPELLING (SPELLING_BOUNDS, bounds, u.i);
|
|
|
|
|
|
}
|
2000-10-11 23:54:33 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Compute the maximum size in bytes of the printed spelling. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
static int
|
|
|
|
|
|
spelling_length (void)
|
|
|
|
|
|
{
|
|
|
|
|
|
int size = 0;
|
|
|
|
|
|
struct spelling *p;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
for (p = spelling_base; p < spelling; p++)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (p->kind == SPELLING_BOUNDS)
|
|
|
|
|
|
size += 25;
|
|
|
|
|
|
else
|
|
|
|
|
|
size += strlen (p->u.s) + 1;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return size;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Print the spelling to BUFFER and return it. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
static char *
|
|
|
|
|
|
print_spelling (char *buffer)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
char *d = buffer;
|
|
|
|
|
|
struct spelling *p;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
for (p = spelling_base; p < spelling; p++)
|
|
|
|
|
|
if (p->kind == SPELLING_BOUNDS)
|
|
|
|
|
|
{
|
|
|
|
|
|
sprintf (d, "[%d]", p->u.i);
|
|
|
|
|
|
d += strlen (d);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
const char *s;
|
|
|
|
|
|
if (p->kind == SPELLING_MEMBER)
|
|
|
|
|
|
*d++ = '.';
|
|
|
|
|
|
for (s = p->u.s; (*d = *s++); d++)
|
|
|
|
|
|
;
|
|
|
|
|
|
}
|
|
|
|
|
|
*d++ = '\0';
|
|
|
|
|
|
return buffer;
|
|
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Issue an error message for a bad initializer component.
|
|
|
|
|
|
MSGID identifies the message.
|
|
|
|
|
|
The component name is taken from the spelling stack. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
void
|
|
|
|
|
|
error_init (const char *msgid)
|
|
|
|
|
|
{
|
|
|
|
|
|
char *ofwhat;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
error ("%s", _(msgid));
|
2003-07-19 16:47:15 +02:00
|
|
|
|
ofwhat = print_spelling (alloca (spelling_length () + 1));
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (*ofwhat)
|
|
|
|
|
|
error ("(near initialization for `%s')", ofwhat);
|
|
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Issue a pedantic warning for a bad initializer component.
|
|
|
|
|
|
MSGID identifies the message.
|
|
|
|
|
|
The component name is taken from the spelling stack. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
void
|
|
|
|
|
|
pedwarn_init (const char *msgid)
|
|
|
|
|
|
{
|
|
|
|
|
|
char *ofwhat;
|
2000-03-30 02:03:14 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
pedwarn ("%s", _(msgid));
|
2003-07-19 16:47:15 +02:00
|
|
|
|
ofwhat = print_spelling (alloca (spelling_length () + 1));
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (*ofwhat)
|
|
|
|
|
|
pedwarn ("(near initialization for `%s')", ofwhat);
|
|
|
|
|
|
}
|
2000-03-30 02:03:14 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Issue a warning for a bad initializer component.
|
|
|
|
|
|
MSGID identifies the message.
|
|
|
|
|
|
The component name is taken from the spelling stack. */
|
1994-09-29 18:23:41 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
static void
|
|
|
|
|
|
warning_init (const char *msgid)
|
|
|
|
|
|
{
|
|
|
|
|
|
char *ofwhat;
|
1996-02-16 21:13:23 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
warning ("%s", _(msgid));
|
2003-07-19 16:47:15 +02:00
|
|
|
|
ofwhat = print_spelling (alloca (spelling_length () + 1));
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (*ofwhat)
|
|
|
|
|
|
warning ("(near initialization for `%s')", ofwhat);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2004-07-22 01:46:20 +02:00
|
|
|
|
/* If TYPE is an array type and EXPR is a parenthesized string
|
|
|
|
|
|
constant, warn if pedantic that EXPR is being used to initialize an
|
|
|
|
|
|
object of type TYPE. */
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
|
maybe_warn_string_init (tree type, struct c_expr expr)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (pedantic
|
|
|
|
|
|
&& TREE_CODE (type) == ARRAY_TYPE
|
|
|
|
|
|
&& TREE_CODE (expr.value) == STRING_CST
|
|
|
|
|
|
&& expr.original_code != STRING_CST)
|
|
|
|
|
|
pedwarn_init ("array initialized from parenthesized string constant");
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Digest the parser output INIT as an initializer for type TYPE.
|
|
|
|
|
|
Return a C expression of type TYPE to represent the initial value.
|
1996-02-16 21:13:23 +01:00
|
|
|
|
|
2004-07-22 01:46:20 +02:00
|
|
|
|
If INIT is a string constant, STRICT_STRING is true if it is
|
|
|
|
|
|
unparenthesized or we should not warn here for it being parenthesized.
|
|
|
|
|
|
For other types of INIT, STRICT_STRING is not used.
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
REQUIRE_CONSTANT requests an error if non-constant initializers or
|
|
|
|
|
|
elements are seen. */
|
1996-02-16 21:13:23 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
static tree
|
2004-07-22 01:46:20 +02:00
|
|
|
|
digest_init (tree type, tree init, bool strict_string, int require_constant)
|
2003-07-18 02:26:51 +02:00
|
|
|
|
{
|
|
|
|
|
|
enum tree_code code = TREE_CODE (type);
|
|
|
|
|
|
tree inside_init = init;
|
1996-02-16 21:13:23 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (type == error_mark_node
|
|
|
|
|
|
|| init == error_mark_node
|
|
|
|
|
|
|| TREE_TYPE (init) == error_mark_node)
|
|
|
|
|
|
return error_mark_node;
|
1996-02-16 21:13:23 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Strip NON_LVALUE_EXPRs since we aren't using as an lvalue. */
|
|
|
|
|
|
/* Do not use STRIP_NOPS here. We do not want an enumerator
|
|
|
|
|
|
whose value is 0 to count as a null pointer constant. */
|
|
|
|
|
|
if (TREE_CODE (init) == NON_LVALUE_EXPR)
|
|
|
|
|
|
inside_init = TREE_OPERAND (init, 0);
|
1996-02-16 21:13:23 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
inside_init = fold (inside_init);
|
1996-02-16 21:13:23 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Initialization of an array of chars from a string constant
|
|
|
|
|
|
optionally enclosed in braces. */
|
1996-02-16 21:13:23 +01:00
|
|
|
|
|
2004-07-25 11:12:21 +02:00
|
|
|
|
if (code == ARRAY_TYPE && inside_init
|
|
|
|
|
|
&& TREE_CODE (inside_init) == STRING_CST)
|
2003-07-18 02:26:51 +02:00
|
|
|
|
{
|
|
|
|
|
|
tree typ1 = TYPE_MAIN_VARIANT (TREE_TYPE (type));
|
2004-07-25 11:12:21 +02:00
|
|
|
|
/* Note that an array could be both an array of character type
|
|
|
|
|
|
and an array of wchar_t if wchar_t is signed char or unsigned
|
|
|
|
|
|
char. */
|
|
|
|
|
|
bool char_array = (typ1 == char_type_node
|
|
|
|
|
|
|| typ1 == signed_char_type_node
|
|
|
|
|
|
|| typ1 == unsigned_char_type_node);
|
|
|
|
|
|
bool wchar_array = !!comptypes (typ1, wchar_type_node);
|
|
|
|
|
|
if (char_array || wchar_array)
|
1996-02-16 21:13:23 +01:00
|
|
|
|
{
|
2004-07-22 01:46:20 +02:00
|
|
|
|
struct c_expr expr;
|
2004-07-25 11:12:21 +02:00
|
|
|
|
bool char_string;
|
2004-07-22 01:46:20 +02:00
|
|
|
|
expr.value = inside_init;
|
|
|
|
|
|
expr.original_code = (strict_string ? STRING_CST : ERROR_MARK);
|
|
|
|
|
|
maybe_warn_string_init (type, expr);
|
|
|
|
|
|
|
2004-07-25 11:12:21 +02:00
|
|
|
|
char_string
|
|
|
|
|
|
= (TYPE_MAIN_VARIANT (TREE_TYPE (TREE_TYPE (inside_init)))
|
|
|
|
|
|
== char_type_node);
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (comptypes (TYPE_MAIN_VARIANT (TREE_TYPE (inside_init)),
|
2004-06-13 19:14:09 +02:00
|
|
|
|
TYPE_MAIN_VARIANT (type)))
|
2003-07-18 02:26:51 +02:00
|
|
|
|
return inside_init;
|
1996-02-16 21:13:23 +01:00
|
|
|
|
|
2004-07-25 11:12:21 +02:00
|
|
|
|
if (!wchar_array && !char_string)
|
2003-07-18 02:26:51 +02:00
|
|
|
|
{
|
|
|
|
|
|
error_init ("char-array initialized from wide string");
|
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
}
|
2004-07-25 11:12:21 +02:00
|
|
|
|
if (char_string && !char_array)
|
2003-07-18 02:26:51 +02:00
|
|
|
|
{
|
2004-07-25 11:12:21 +02:00
|
|
|
|
error_init ("wchar_t-array initialized from non-wide string");
|
2003-07-18 02:26:51 +02:00
|
|
|
|
return error_mark_node;
|
1996-02-16 21:13:23 +01:00
|
|
|
|
}
|
2003-06-22 15:41:26 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
TREE_TYPE (inside_init) = type;
|
|
|
|
|
|
if (TYPE_DOMAIN (type) != 0
|
|
|
|
|
|
&& TYPE_SIZE (type) != 0
|
|
|
|
|
|
&& TREE_CODE (TYPE_SIZE (type)) == INTEGER_CST
|
|
|
|
|
|
/* Subtract 1 (or sizeof (wchar_t))
|
|
|
|
|
|
because it's ok to ignore the terminating null char
|
|
|
|
|
|
that is counted in the length of the constant. */
|
|
|
|
|
|
&& 0 > compare_tree_int (TYPE_SIZE_UNIT (type),
|
|
|
|
|
|
TREE_STRING_LENGTH (inside_init)
|
|
|
|
|
|
- ((TYPE_PRECISION (typ1)
|
|
|
|
|
|
!= TYPE_PRECISION (char_type_node))
|
|
|
|
|
|
? (TYPE_PRECISION (wchar_type_node)
|
|
|
|
|
|
/ BITS_PER_UNIT)
|
|
|
|
|
|
: 1)))
|
|
|
|
|
|
pedwarn_init ("initializer-string for array of chars is too long");
|
1996-02-16 21:13:23 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
return inside_init;
|
1996-02-16 21:13:23 +01:00
|
|
|
|
}
|
2004-07-25 11:12:21 +02:00
|
|
|
|
else if (INTEGRAL_TYPE_P (typ1))
|
|
|
|
|
|
{
|
|
|
|
|
|
error_init ("array of inappropriate type initialized "
|
|
|
|
|
|
"from string constant");
|
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
}
|
1996-02-16 21:13:23 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Build a VECTOR_CST from a *constant* vector constructor. If the
|
|
|
|
|
|
vector constructor is not constant (e.g. {1,2,3,foo()}) then punt
|
|
|
|
|
|
below and handle as a constructor. */
|
|
|
|
|
|
if (code == VECTOR_TYPE
|
2004-05-05 09:23:00 +02:00
|
|
|
|
&& vector_types_convertible_p (TREE_TYPE (inside_init), type)
|
2003-07-18 02:26:51 +02:00
|
|
|
|
&& TREE_CONSTANT (inside_init))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (TREE_CODE (inside_init) == VECTOR_CST
|
2004-05-05 09:23:00 +02:00
|
|
|
|
&& comptypes (TYPE_MAIN_VARIANT (TREE_TYPE (inside_init)),
|
2004-06-13 19:14:09 +02:00
|
|
|
|
TYPE_MAIN_VARIANT (type)))
|
2003-07-18 02:26:51 +02:00
|
|
|
|
return inside_init;
|
|
|
|
|
|
else
|
|
|
|
|
|
return build_vector (type, CONSTRUCTOR_ELTS (inside_init));
|
|
|
|
|
|
}
|
2003-05-05 21:21:10 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Any type can be initialized
|
|
|
|
|
|
from an expression of the same type, optionally with braces. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (inside_init && TREE_TYPE (inside_init) != 0
|
|
|
|
|
|
&& (comptypes (TYPE_MAIN_VARIANT (TREE_TYPE (inside_init)),
|
2004-06-13 19:14:09 +02:00
|
|
|
|
TYPE_MAIN_VARIANT (type))
|
2003-07-18 02:26:51 +02:00
|
|
|
|
|| (code == ARRAY_TYPE
|
2004-06-13 19:14:09 +02:00
|
|
|
|
&& comptypes (TREE_TYPE (inside_init), type))
|
2003-07-18 02:26:51 +02:00
|
|
|
|
|| (code == VECTOR_TYPE
|
2004-06-13 19:14:09 +02:00
|
|
|
|
&& comptypes (TREE_TYPE (inside_init), type))
|
2003-07-18 02:26:51 +02:00
|
|
|
|
|| (code == POINTER_TYPE
|
2004-01-09 21:03:58 +01:00
|
|
|
|
&& TREE_CODE (TREE_TYPE (inside_init)) == ARRAY_TYPE
|
2003-07-18 02:26:51 +02:00
|
|
|
|
&& comptypes (TREE_TYPE (TREE_TYPE (inside_init)),
|
2004-06-13 19:14:09 +02:00
|
|
|
|
TREE_TYPE (type)))
|
2004-01-09 21:03:58 +01:00
|
|
|
|
|| (code == POINTER_TYPE
|
|
|
|
|
|
&& TREE_CODE (TREE_TYPE (inside_init)) == FUNCTION_TYPE
|
|
|
|
|
|
&& comptypes (TREE_TYPE (inside_init),
|
2004-06-13 19:14:09 +02:00
|
|
|
|
TREE_TYPE (type)))))
|
2003-07-18 02:26:51 +02:00
|
|
|
|
{
|
|
|
|
|
|
if (code == POINTER_TYPE)
|
2003-10-04 20:02:32 +02:00
|
|
|
|
{
|
|
|
|
|
|
inside_init = default_function_array_conversion (inside_init);
|
|
|
|
|
|
|
|
|
|
|
|
if (TREE_CODE (TREE_TYPE (inside_init)) == ARRAY_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
error_init ("invalid use of non-lvalue array");
|
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2003-08-10 17:17:35 +02:00
|
|
|
|
if (code == VECTOR_TYPE)
|
|
|
|
|
|
/* Although the types are compatible, we may require a
|
|
|
|
|
|
conversion. */
|
|
|
|
|
|
inside_init = convert (type, inside_init);
|
2003-07-18 02:26:51 +02:00
|
|
|
|
|
|
|
|
|
|
if (require_constant && !flag_isoc99
|
|
|
|
|
|
&& TREE_CODE (inside_init) == COMPOUND_LITERAL_EXPR)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* As an extension, allow initializing objects with static storage
|
|
|
|
|
|
duration with compound literals (which are then treated just as
|
|
|
|
|
|
the brace enclosed list they contain). */
|
|
|
|
|
|
tree decl = COMPOUND_LITERAL_EXPR_DECL (inside_init);
|
|
|
|
|
|
inside_init = DECL_INITIAL (decl);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
|
|
|
|
|
|
if (code == ARRAY_TYPE && TREE_CODE (inside_init) != STRING_CST
|
|
|
|
|
|
&& TREE_CODE (inside_init) != CONSTRUCTOR)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
error_init ("array initialized from non-constant array expression");
|
|
|
|
|
|
return error_mark_node;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (optimize && TREE_CODE (inside_init) == VAR_DECL)
|
|
|
|
|
|
inside_init = decl_constant_value_for_broken_optimization (inside_init);
|
2003-06-22 15:41:26 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Compound expressions can only occur here if -pedantic or
|
|
|
|
|
|
-pedantic-errors is specified. In the later case, we always want
|
|
|
|
|
|
an error. In the former case, we simply want a warning. */
|
|
|
|
|
|
if (require_constant && pedantic
|
|
|
|
|
|
&& TREE_CODE (inside_init) == COMPOUND_EXPR)
|
|
|
|
|
|
{
|
|
|
|
|
|
inside_init
|
|
|
|
|
|
= valid_compound_expr_initializer (inside_init,
|
|
|
|
|
|
TREE_TYPE (inside_init));
|
|
|
|
|
|
if (inside_init == error_mark_node)
|
|
|
|
|
|
error_init ("initializer element is not constant");
|
2003-06-22 15:41:26 +02:00
|
|
|
|
else
|
2003-07-18 02:26:51 +02:00
|
|
|
|
pedwarn_init ("initializer element is not constant");
|
|
|
|
|
|
if (flag_pedantic_errors)
|
|
|
|
|
|
inside_init = error_mark_node;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (require_constant
|
|
|
|
|
|
&& (!TREE_CONSTANT (inside_init)
|
|
|
|
|
|
/* This test catches things like `7 / 0' which
|
|
|
|
|
|
result in an expression for which TREE_CONSTANT
|
|
|
|
|
|
is true, but which is not actually something
|
|
|
|
|
|
that is a legal constant. We really should not
|
|
|
|
|
|
be using this function, because it is a part of
|
|
|
|
|
|
the back-end. Instead, the expression should
|
|
|
|
|
|
already have been turned into ERROR_MARK_NODE. */
|
|
|
|
|
|
|| !initializer_constant_valid_p (inside_init,
|
|
|
|
|
|
TREE_TYPE (inside_init))))
|
|
|
|
|
|
{
|
|
|
|
|
|
error_init ("initializer element is not constant");
|
|
|
|
|
|
inside_init = error_mark_node;
|
1993-04-10 01:11:51 +02:00
|
|
|
|
}
|
2002-03-19 09:47:14 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
return inside_init;
|
|
|
|
|
|
}
|
2002-03-19 09:47:14 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Handle scalar types, including conversions. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (code == INTEGER_TYPE || code == REAL_TYPE || code == POINTER_TYPE
|
2004-05-05 09:23:00 +02:00
|
|
|
|
|| code == ENUMERAL_TYPE || code == BOOLEAN_TYPE || code == COMPLEX_TYPE
|
|
|
|
|
|
|| code == VECTOR_TYPE)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Note that convert_for_assignment calls default_conversion
|
|
|
|
|
|
for arrays and functions. We must not call it in the
|
|
|
|
|
|
case where inside_init is a null pointer constant. */
|
|
|
|
|
|
inside_init
|
|
|
|
|
|
= convert_for_assignment (type, init, _("initialization"),
|
|
|
|
|
|
NULL_TREE, NULL_TREE, 0);
|
2003-06-22 15:41:26 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (require_constant && ! TREE_CONSTANT (inside_init))
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
error_init ("initializer element is not constant");
|
|
|
|
|
|
inside_init = error_mark_node;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else if (require_constant
|
|
|
|
|
|
&& initializer_constant_valid_p (inside_init, TREE_TYPE (inside_init)) == 0)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
error_init ("initializer element is not computable at load time");
|
|
|
|
|
|
inside_init = error_mark_node;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
|
|
|
|
|
|
return inside_init;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
1993-09-15 04:03:22 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Come here only for records and arrays. */
|
1993-09-15 04:03:22 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (COMPLETE_TYPE_P (type) && TREE_CODE (TYPE_SIZE (type)) != INTEGER_CST)
|
1993-09-15 04:03:22 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
error_init ("variable-sized object may not be initialized");
|
|
|
|
|
|
return error_mark_node;
|
1993-09-15 04:03:22 +02:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
|
|
|
|
|
|
error_init ("invalid initializer");
|
|
|
|
|
|
return error_mark_node;
|
1993-09-15 04:03:22 +02:00
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Handle initializers that use braces. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Type of object we are accumulating a constructor for.
|
|
|
|
|
|
This type is always a RECORD_TYPE, UNION_TYPE or ARRAY_TYPE. */
|
|
|
|
|
|
static tree constructor_type;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* For a RECORD_TYPE or UNION_TYPE, this is the chain of fields
|
|
|
|
|
|
left to fill. */
|
|
|
|
|
|
static tree constructor_fields;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* For an ARRAY_TYPE, this is the specified index
|
|
|
|
|
|
at which to store the next element we get. */
|
|
|
|
|
|
static tree constructor_index;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* For an ARRAY_TYPE, this is the maximum index. */
|
|
|
|
|
|
static tree constructor_max_index;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* For a RECORD_TYPE, this is the first field not yet written out. */
|
|
|
|
|
|
static tree constructor_unfilled_fields;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* For an ARRAY_TYPE, this is the index of the first element
|
|
|
|
|
|
not yet written out. */
|
|
|
|
|
|
static tree constructor_unfilled_index;
|
2000-07-12 22:15:20 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* In a RECORD_TYPE, the byte index of the next consecutive field.
|
|
|
|
|
|
This is so we can generate gaps between fields, when appropriate. */
|
|
|
|
|
|
static tree constructor_bit_index;
|
1993-07-02 03:26:01 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* If we are saving up the elements rather than allocating them,
|
|
|
|
|
|
this is the list of elements so far (in reverse order,
|
|
|
|
|
|
most recent first). */
|
|
|
|
|
|
static tree constructor_elements;
|
2001-12-28 10:51:20 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* 1 if constructor should be incrementally stored into a constructor chain,
|
|
|
|
|
|
0 if all the elements should be kept in AVL tree. */
|
|
|
|
|
|
static int constructor_incremental;
|
2001-12-28 10:51:20 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* 1 if so far this constructor's elements are all compile-time constants. */
|
|
|
|
|
|
static int constructor_constant;
|
2001-12-28 10:51:20 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* 1 if so far this constructor's elements are all valid address constants. */
|
|
|
|
|
|
static int constructor_simple;
|
2001-12-28 10:51:20 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* 1 if this constructor is erroneous so far. */
|
|
|
|
|
|
static int constructor_erroneous;
|
1992-03-14 06:07:15 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Structure for managing pending initializer elements, organized as an
|
|
|
|
|
|
AVL tree. */
|
1992-03-14 06:07:15 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
struct init_node
|
1992-03-14 06:07:15 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
struct init_node *left, *right;
|
|
|
|
|
|
struct init_node *parent;
|
|
|
|
|
|
int balance;
|
|
|
|
|
|
tree purpose;
|
|
|
|
|
|
tree value;
|
1992-03-14 06:07:15 +01:00
|
|
|
|
};
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Tree of pending elements at this constructor level.
|
|
|
|
|
|
These are elements encountered out of order
|
|
|
|
|
|
which belong at places we haven't reached yet in actually
|
|
|
|
|
|
writing the output.
|
|
|
|
|
|
Will never hold tree nodes across GC runs. */
|
|
|
|
|
|
static struct init_node *constructor_pending_elts;
|
1992-03-14 06:07:15 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* The SPELLING_DEPTH of this constructor. */
|
|
|
|
|
|
static int constructor_depth;
|
1992-03-14 06:07:15 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* 0 if implicitly pushing constructor levels is allowed. */
|
|
|
|
|
|
int constructor_no_implicit = 0; /* 0 for C; 1 for some other languages. */
|
1992-03-14 06:07:15 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* DECL node for which an initializer is being read.
|
|
|
|
|
|
0 means we are reading a constructor expression
|
|
|
|
|
|
such as (struct foo) {...}. */
|
|
|
|
|
|
static tree constructor_decl;
|
1992-03-14 06:07:15 +01:00
|
|
|
|
|
2004-02-05 22:56:38 +01:00
|
|
|
|
/* start_init saves the ASMSPEC arg here for really_start_incremental_init. */
|
|
|
|
|
|
static const char *constructor_asmspec;
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Nonzero if this is an initializer for a top-level decl. */
|
|
|
|
|
|
static int constructor_top_level;
|
1992-03-14 06:07:15 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Nonzero if there were any member designators in this initializer. */
|
|
|
|
|
|
static int constructor_designated;
|
1992-03-14 06:07:15 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Nesting depth of designator list. */
|
|
|
|
|
|
static int designator_depth;
|
1992-03-14 06:07:15 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Nonzero if there were diagnosed errors in this designator list. */
|
|
|
|
|
|
static int designator_errorneous;
|
1992-03-14 06:07:15 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
|
|
|
|
|
|
/* This stack has a level for each implicit or explicit level of
|
|
|
|
|
|
structuring in the initializer, including the outermost one. It
|
|
|
|
|
|
saves the values of most of the variables above. */
|
1992-03-14 06:07:15 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
struct constructor_range_stack;
|
|
|
|
|
|
|
|
|
|
|
|
struct constructor_stack
|
1992-03-14 06:07:15 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
struct constructor_stack *next;
|
|
|
|
|
|
tree type;
|
|
|
|
|
|
tree fields;
|
|
|
|
|
|
tree index;
|
|
|
|
|
|
tree max_index;
|
|
|
|
|
|
tree unfilled_index;
|
|
|
|
|
|
tree unfilled_fields;
|
|
|
|
|
|
tree bit_index;
|
|
|
|
|
|
tree elements;
|
|
|
|
|
|
struct init_node *pending_elts;
|
|
|
|
|
|
int offset;
|
|
|
|
|
|
int depth;
|
2004-07-22 01:46:20 +02:00
|
|
|
|
/* If value nonzero, this value should replace the entire
|
2003-07-18 02:26:51 +02:00
|
|
|
|
constructor at this level. */
|
2004-07-22 01:46:20 +02:00
|
|
|
|
struct c_expr replacement_value;
|
2003-07-18 02:26:51 +02:00
|
|
|
|
struct constructor_range_stack *range_stack;
|
|
|
|
|
|
char constant;
|
|
|
|
|
|
char simple;
|
|
|
|
|
|
char implicit;
|
|
|
|
|
|
char erroneous;
|
|
|
|
|
|
char outer;
|
|
|
|
|
|
char incremental;
|
|
|
|
|
|
char designated;
|
|
|
|
|
|
};
|
1992-03-14 06:07:15 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
struct constructor_stack *constructor_stack;
|
1992-03-14 06:07:15 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* This stack represents designators from some range designator up to
|
|
|
|
|
|
the last designator in the list. */
|
1992-03-14 06:07:15 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
struct constructor_range_stack
|
|
|
|
|
|
{
|
|
|
|
|
|
struct constructor_range_stack *next, *prev;
|
|
|
|
|
|
struct constructor_stack *stack;
|
|
|
|
|
|
tree range_start;
|
|
|
|
|
|
tree index;
|
|
|
|
|
|
tree range_end;
|
|
|
|
|
|
tree fields;
|
|
|
|
|
|
};
|
1992-03-14 06:07:15 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
struct constructor_range_stack *constructor_range_stack;
|
1992-03-14 06:07:15 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* This stack records separate initializers that are nested.
|
|
|
|
|
|
Nested initializers can't happen in ANSI C, but GNU C allows them
|
|
|
|
|
|
in cases like { ... (struct foo) { ... } ... }. */
|
1992-03-14 06:07:15 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
struct initializer_stack
|
1992-03-14 06:07:15 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
struct initializer_stack *next;
|
|
|
|
|
|
tree decl;
|
2004-02-05 22:56:38 +01:00
|
|
|
|
const char *asmspec;
|
2003-07-18 02:26:51 +02:00
|
|
|
|
struct constructor_stack *constructor_stack;
|
|
|
|
|
|
struct constructor_range_stack *constructor_range_stack;
|
|
|
|
|
|
tree elements;
|
|
|
|
|
|
struct spelling *spelling;
|
|
|
|
|
|
struct spelling *spelling_base;
|
|
|
|
|
|
int spelling_size;
|
|
|
|
|
|
char top_level;
|
|
|
|
|
|
char require_constant_value;
|
|
|
|
|
|
char require_constant_elements;
|
|
|
|
|
|
};
|
1992-03-14 06:07:15 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
struct initializer_stack *initializer_stack;
|
|
|
|
|
|
|
|
|
|
|
|
/* Prepare to parse and output the initializer for variable DECL. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
|
|
|
|
|
void
|
2004-02-05 22:56:38 +01:00
|
|
|
|
start_init (tree decl, tree asmspec_tree, int top_level)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
const char *locus;
|
2003-07-19 16:47:15 +02:00
|
|
|
|
struct initializer_stack *p = xmalloc (sizeof (struct initializer_stack));
|
2004-02-05 22:56:38 +01:00
|
|
|
|
const char *asmspec = 0;
|
|
|
|
|
|
|
|
|
|
|
|
if (asmspec_tree)
|
|
|
|
|
|
asmspec = TREE_STRING_POINTER (asmspec_tree);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
p->decl = constructor_decl;
|
2004-02-05 22:56:38 +01:00
|
|
|
|
p->asmspec = constructor_asmspec;
|
2003-07-18 02:26:51 +02:00
|
|
|
|
p->require_constant_value = require_constant_value;
|
|
|
|
|
|
p->require_constant_elements = require_constant_elements;
|
|
|
|
|
|
p->constructor_stack = constructor_stack;
|
|
|
|
|
|
p->constructor_range_stack = constructor_range_stack;
|
|
|
|
|
|
p->elements = constructor_elements;
|
|
|
|
|
|
p->spelling = spelling;
|
|
|
|
|
|
p->spelling_base = spelling_base;
|
|
|
|
|
|
p->spelling_size = spelling_size;
|
|
|
|
|
|
p->top_level = constructor_top_level;
|
|
|
|
|
|
p->next = initializer_stack;
|
|
|
|
|
|
initializer_stack = p;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
constructor_decl = decl;
|
2004-02-05 22:56:38 +01:00
|
|
|
|
constructor_asmspec = asmspec;
|
2003-07-18 02:26:51 +02:00
|
|
|
|
constructor_designated = 0;
|
|
|
|
|
|
constructor_top_level = top_level;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (decl != 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
require_constant_value = TREE_STATIC (decl);
|
|
|
|
|
|
require_constant_elements
|
|
|
|
|
|
= ((TREE_STATIC (decl) || (pedantic && !flag_isoc99))
|
|
|
|
|
|
/* For a scalar, you can always use any value to initialize,
|
|
|
|
|
|
even within braces. */
|
|
|
|
|
|
&& (TREE_CODE (TREE_TYPE (decl)) == ARRAY_TYPE
|
|
|
|
|
|
|| TREE_CODE (TREE_TYPE (decl)) == RECORD_TYPE
|
|
|
|
|
|
|| TREE_CODE (TREE_TYPE (decl)) == UNION_TYPE
|
|
|
|
|
|
|| TREE_CODE (TREE_TYPE (decl)) == QUAL_UNION_TYPE));
|
|
|
|
|
|
locus = IDENTIFIER_POINTER (DECL_NAME (decl));
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
require_constant_value = 0;
|
|
|
|
|
|
require_constant_elements = 0;
|
|
|
|
|
|
locus = "(anonymous)";
|
|
|
|
|
|
}
|
1993-12-16 00:30:48 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
constructor_stack = 0;
|
|
|
|
|
|
constructor_range_stack = 0;
|
1993-12-16 00:30:48 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
missing_braces_mentioned = 0;
|
|
|
|
|
|
|
|
|
|
|
|
spelling_base = 0;
|
|
|
|
|
|
spelling_size = 0;
|
|
|
|
|
|
RESTORE_SPELLING_DEPTH (0);
|
|
|
|
|
|
|
|
|
|
|
|
if (locus)
|
|
|
|
|
|
push_string (locus);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
|
finish_init (void)
|
1993-12-16 00:30:48 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
struct initializer_stack *p = initializer_stack;
|
1993-12-16 00:30:48 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Free the whole constructor stack of this initializer. */
|
|
|
|
|
|
while (constructor_stack)
|
|
|
|
|
|
{
|
|
|
|
|
|
struct constructor_stack *q = constructor_stack;
|
|
|
|
|
|
constructor_stack = q->next;
|
|
|
|
|
|
free (q);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (constructor_range_stack)
|
|
|
|
|
|
abort ();
|
|
|
|
|
|
|
|
|
|
|
|
/* Pop back to the data of the outer initializer (if any). */
|
2004-01-02 23:42:31 +01:00
|
|
|
|
free (spelling_base);
|
2004-06-02 21:46:13 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
constructor_decl = p->decl;
|
2004-02-05 22:56:38 +01:00
|
|
|
|
constructor_asmspec = p->asmspec;
|
2003-07-18 02:26:51 +02:00
|
|
|
|
require_constant_value = p->require_constant_value;
|
|
|
|
|
|
require_constant_elements = p->require_constant_elements;
|
|
|
|
|
|
constructor_stack = p->constructor_stack;
|
|
|
|
|
|
constructor_range_stack = p->constructor_range_stack;
|
|
|
|
|
|
constructor_elements = p->elements;
|
|
|
|
|
|
spelling = p->spelling;
|
|
|
|
|
|
spelling_base = p->spelling_base;
|
|
|
|
|
|
spelling_size = p->spelling_size;
|
|
|
|
|
|
constructor_top_level = p->top_level;
|
|
|
|
|
|
initializer_stack = p->next;
|
|
|
|
|
|
free (p);
|
1993-12-16 00:30:48 +01:00
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Call here when we see the initializer is surrounded by braces.
|
|
|
|
|
|
This is instead of a call to push_init_level;
|
|
|
|
|
|
it is matched by a call to pop_init_level.
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
TYPE is the type to initialize, for a constructor expression.
|
|
|
|
|
|
For an initializer for a decl, TYPE is zero. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
void
|
|
|
|
|
|
really_start_incremental_init (tree type)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-19 16:47:15 +02:00
|
|
|
|
struct constructor_stack *p = xmalloc (sizeof (struct constructor_stack));
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (type == 0)
|
|
|
|
|
|
type = TREE_TYPE (constructor_decl);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
alias.c, [...]: Replace calls via (*targetm.foo) () with targetm.foo ().
* alias.c, attribs.c, bt-load.c, builtins.c, c-common.c,
c-decl.c, c-objc-common.c, c-typeck.c, calls.c, cfglayout.c,
cse.c, dbxout.c, dwarf2out.c, except.c, final.c,
haifa-sched.c, integrate.c, passes.c, rtlanal.c, sched-rgn.c,
sched-vis.c, simplify-rtx.c, stor-layout.c, tree.c, varasm.c,
vmsdbgout.c: Replace calls via (*targetm.foo) () with
targetm.foo ().
From-SVN: r79729
2004-03-20 05:52:59 +01:00
|
|
|
|
if (targetm.vector_opaque_p (type))
|
2003-07-18 02:26:51 +02:00
|
|
|
|
error ("opaque vector types cannot be initialized");
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
p->type = constructor_type;
|
|
|
|
|
|
p->fields = constructor_fields;
|
|
|
|
|
|
p->index = constructor_index;
|
|
|
|
|
|
p->max_index = constructor_max_index;
|
|
|
|
|
|
p->unfilled_index = constructor_unfilled_index;
|
|
|
|
|
|
p->unfilled_fields = constructor_unfilled_fields;
|
|
|
|
|
|
p->bit_index = constructor_bit_index;
|
|
|
|
|
|
p->elements = constructor_elements;
|
|
|
|
|
|
p->constant = constructor_constant;
|
|
|
|
|
|
p->simple = constructor_simple;
|
|
|
|
|
|
p->erroneous = constructor_erroneous;
|
|
|
|
|
|
p->pending_elts = constructor_pending_elts;
|
|
|
|
|
|
p->depth = constructor_depth;
|
2004-07-22 01:46:20 +02:00
|
|
|
|
p->replacement_value.value = 0;
|
|
|
|
|
|
p->replacement_value.original_code = ERROR_MARK;
|
2003-07-18 02:26:51 +02:00
|
|
|
|
p->implicit = 0;
|
|
|
|
|
|
p->range_stack = 0;
|
|
|
|
|
|
p->outer = 0;
|
|
|
|
|
|
p->incremental = constructor_incremental;
|
|
|
|
|
|
p->designated = constructor_designated;
|
|
|
|
|
|
p->next = 0;
|
|
|
|
|
|
constructor_stack = p;
|
2001-03-27 08:03:40 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
constructor_constant = 1;
|
|
|
|
|
|
constructor_simple = 1;
|
|
|
|
|
|
constructor_depth = SPELLING_DEPTH ();
|
|
|
|
|
|
constructor_elements = 0;
|
|
|
|
|
|
constructor_pending_elts = 0;
|
|
|
|
|
|
constructor_type = type;
|
|
|
|
|
|
constructor_incremental = 1;
|
|
|
|
|
|
constructor_designated = 0;
|
|
|
|
|
|
designator_depth = 0;
|
|
|
|
|
|
designator_errorneous = 0;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (TREE_CODE (constructor_type) == RECORD_TYPE
|
|
|
|
|
|
|| TREE_CODE (constructor_type) == UNION_TYPE)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
constructor_fields = TYPE_FIELDS (constructor_type);
|
|
|
|
|
|
/* Skip any nameless bit fields at the beginning. */
|
|
|
|
|
|
while (constructor_fields != 0 && DECL_C_BIT_FIELD (constructor_fields)
|
|
|
|
|
|
&& DECL_NAME (constructor_fields) == 0)
|
|
|
|
|
|
constructor_fields = TREE_CHAIN (constructor_fields);
|
tree.h (INT_CST_LT, [...]): Remove unneeded casts.
* tree.h (INT_CST_LT, INT_CST_LT_UNSIGNED): Remove unneeded casts.
(struct tree_int_cst): int_cst_low is now unsigned HOST_WIDE_INT.
(attribute_hash_list, type_hash_canon): hashcode is now unsigned.
(type_hash_lookup, type_hash_add, type_hash_list): Likewise.
(min_precision): Result is unsignd.
(add_double, neg_double, mul_double): Low word is unsigned.
(lshift_double, rshift_double, lrotate_double): Likewise.
(rrotate_double, div_and_round_double): Likewise.
(tree_floor_log2, compare_tree_int): New functions.
(preserve_rtl_expr_temps): New declaration.
* c-common.c (declare_hidden_char_array): Use compare_tree_int.
(decl_attributes): Use tree_log2 to find alignment.
Check for TREE_INT_CST_HIGH for format args.
(min_precision): Now unsigned.
Use tree_floor_log2.
(truthvalue_conversion): Delete long-disabled code.
* c-decl.c (finish_struct): Clean up tests on field width.
(finish_function): Use compare_tree_int.
* c-pragma.c (handle_pragma_token): Use tree_log2 for alignment.
* c-typeck.c (comptypes): Use tree_int_cst_equal.
(default_conversion, digest_init): Use compare_tree_int.
(build_binary_op): Use integer_all_onesp and compare_tree_int.
Fix type errors in forming masks.
* calls.c (initialize_argument_information): Use compare_tree_int.
* dbxout.c (dbxout_type): Cast TREE_INT_CST_LOW to HOST_WIDE_INT.
* except.c (expand_eh_region_start_tree): Use compare_tree_int.
* expr.c (is_zeros_p, case INTEGER_CST): Use integer_zerop.
(store_field): Use compare_tree_int.
(expand_expr, case CONSTRUCTOR): Use TYPE_SIZE_UNIT.
(expand_expr, case ARRAY_REF): Use compare_tree_int.
(do_jump, case BIT_AND_EXPR): Use tree_floor_log2.
(do_store_flag): Use compare_tree_int.
* fold-const.c (encode, decode): Low part is always unsigned.
(force_fit_type, add_double, neg_double, mul_double): Likewise.
(lshift_double, rshift_double, lrotate_double): Likewise.
(rrotate_double, div_and_round_double, int_const_binop): Likewise.
(fold_convert): Use compare_tree_int.
(operand_equal_p, case INTEGER_CST): Use tree_int_cst_equal.
(invert_truthvalue, case INTEGER_CST): Likewise.
(fold): Use compare_tree_int; add casts for unsigned TREE_INT_CST_LOW.
* mkdeps.c (deps_dummy_targets): Make I unsigned.
* rtl.h (add_double, neg_double, mul_double): Low words are unsigned.
(lshift_double, rshift_double, lrotate_double, rrotate_double):
Likewise.
* stmt.c (expand_decl): Use compare_tree_int and mode_for_size_tree.
(expand_end_case): Use compare_tree_int.
(estimate_case_costs): Cast TREE_INT_CST_LOW to HOST_WIDE_INT.
* stor-layout.c (mode_for_size_tree): Use compare_tree_int.
(layout_decl): Likewise.
(layout_record, layout_union): Make sizes unsigned.
(layout_type, case VOID_TYPE): TYPE_SIZE must be bitsizetype.
(layout_type, case QUAL_UNION_TYPE): Use compare_tree_int.
* tree.c (struct type_hash): hashcode is unsigned.
(build_type_attribute_variant, type_hash_list): Likewise.
(type_hash_lookup, type_hash_add, type_hash_canon): Likewise.
(attribute_hash_list, build_array_type, build_method_type): Likewise.
(build_complex_type): Likewise.
(real_value_from_int_cst): Remove unneeded casts.
(integer_all_onesp): Add casts.
(tree_floor_log2, compare_tree_int): New functions.
(build_index_type): Use tree_int_cst_sgn.
* varasm.c (assemble_variable): Use compare_tree_int.
* ch/actions.c (chill_convert_for_assignment): INDEX is unsigned
HOST_WIDE_INT.
* ch/ch-tree.h (DECL_NESTING_LEVEL): Use TREE_INT_CST_HIGH
since unsigned.
* ch/except.c (chill_handle_on_labels): ALTERNATIVE is unsigned.
Use compare_tree_int.
(expand_goto_except_cleanup): Likewise.
* cp/class.c (dfs_modify_vtables): I is now unsigned.
(check_bitfield_decl): Use tree_int_cst_sgn and compare_tree_int.
(build_base_field): Add casts of TREE_INT_CST_LOW to HOST_WIDE_INT.
* cp/error.c (dump_expr): Cast TREE_INT_CST_HIGH to unsigned.
* cp/init.c (build_vec_init): Cast TREE_INT_CST_LOW to HOST_WIDE_INT.
* cp/method.c (build_overload_int): Cast TREE_INT_CST_HIGH to unsigned.
* cp/typeck.c (build_binary_op, case TRUNC_DIV_EXPR):
Call integer_all_onesp.
* cp/typeck2.c (process_init_constructor): Use compare_tree_int.
* f/com.c (ffecom_f2c_set_lio_code_): Use compare_tree_int.
(ffecom_sym_transform_, ffecom_transform_common_): Likewise.
(ffecom_transform_equiv_): Likewise.
* java/decl.c (emit_init_test_initialization): Mark KEY as unused.
* java/expr.c (build_newarray): Cast TREE_INT_CST_LOW to HOST_WIDE_INT.
(build_anewarray): Likewise.
* java/parse.y (patch_newarray): Likewise.
* java/parse.c: Regenerated.
From-SVN: r32383
2000-03-07 12:41:32 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
constructor_unfilled_fields = constructor_fields;
|
|
|
|
|
|
constructor_bit_index = bitsize_zero_node;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else if (TREE_CODE (constructor_type) == ARRAY_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (TYPE_DOMAIN (constructor_type))
|
|
|
|
|
|
{
|
|
|
|
|
|
constructor_max_index
|
|
|
|
|
|
= TYPE_MAX_VALUE (TYPE_DOMAIN (constructor_type));
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Detect non-empty initializations of zero-length arrays. */
|
|
|
|
|
|
if (constructor_max_index == NULL_TREE
|
|
|
|
|
|
&& TYPE_SIZE (constructor_type))
|
|
|
|
|
|
constructor_max_index = build_int_2 (-1, -1);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* constructor_max_index needs to be an INTEGER_CST. Attempts
|
|
|
|
|
|
to initialize VLAs will cause a proper error; avoid tree
|
|
|
|
|
|
checking errors as well by setting a safe value. */
|
|
|
|
|
|
if (constructor_max_index
|
|
|
|
|
|
&& TREE_CODE (constructor_max_index) != INTEGER_CST)
|
|
|
|
|
|
constructor_max_index = build_int_2 (-1, -1);
|
2001-12-12 20:12:16 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
constructor_index
|
|
|
|
|
|
= convert (bitsizetype,
|
|
|
|
|
|
TYPE_MIN_VALUE (TYPE_DOMAIN (constructor_type)));
|
2001-12-12 20:12:16 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else
|
|
|
|
|
|
constructor_index = bitsize_zero_node;
|
2001-12-12 20:12:16 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
constructor_unfilled_index = constructor_index;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (TREE_CODE (constructor_type) == VECTOR_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Vectors are like simple fixed-size arrays. */
|
|
|
|
|
|
constructor_max_index =
|
|
|
|
|
|
build_int_2 (TYPE_VECTOR_SUBPARTS (constructor_type) - 1, 0);
|
|
|
|
|
|
constructor_index = convert (bitsizetype, bitsize_zero_node);
|
|
|
|
|
|
constructor_unfilled_index = constructor_index;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Handle the case of int x = {5}; */
|
|
|
|
|
|
constructor_fields = constructor_type;
|
|
|
|
|
|
constructor_unfilled_fields = constructor_type;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Push down into a subobject, for initialization.
|
|
|
|
|
|
If this is for an explicit set of braces, IMPLICIT is 0.
|
|
|
|
|
|
If it is because the next element belongs at a lower level,
|
|
|
|
|
|
IMPLICIT is 1 (or 2 if the push is because of designator list). */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
void
|
|
|
|
|
|
push_init_level (int implicit)
|
|
|
|
|
|
{
|
|
|
|
|
|
struct constructor_stack *p;
|
|
|
|
|
|
tree value = NULL_TREE;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* If we've exhausted any levels that didn't have braces,
|
|
|
|
|
|
pop them now. */
|
|
|
|
|
|
while (constructor_stack->implicit)
|
|
|
|
|
|
{
|
|
|
|
|
|
if ((TREE_CODE (constructor_type) == RECORD_TYPE
|
|
|
|
|
|
|| TREE_CODE (constructor_type) == UNION_TYPE)
|
|
|
|
|
|
&& constructor_fields == 0)
|
|
|
|
|
|
process_init_element (pop_init_level (1));
|
|
|
|
|
|
else if (TREE_CODE (constructor_type) == ARRAY_TYPE
|
|
|
|
|
|
&& constructor_max_index
|
|
|
|
|
|
&& tree_int_cst_lt (constructor_max_index, constructor_index))
|
|
|
|
|
|
process_init_element (pop_init_level (1));
|
|
|
|
|
|
else
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Unless this is an explicit brace, we need to preserve previous
|
|
|
|
|
|
content if any. */
|
|
|
|
|
|
if (implicit)
|
|
|
|
|
|
{
|
|
|
|
|
|
if ((TREE_CODE (constructor_type) == RECORD_TYPE
|
|
|
|
|
|
|| TREE_CODE (constructor_type) == UNION_TYPE)
|
|
|
|
|
|
&& constructor_fields)
|
|
|
|
|
|
value = find_init_member (constructor_fields);
|
|
|
|
|
|
else if (TREE_CODE (constructor_type) == ARRAY_TYPE)
|
|
|
|
|
|
value = find_init_member (constructor_index);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
2003-07-19 16:47:15 +02:00
|
|
|
|
p = xmalloc (sizeof (struct constructor_stack));
|
2003-07-18 02:26:51 +02:00
|
|
|
|
p->type = constructor_type;
|
|
|
|
|
|
p->fields = constructor_fields;
|
|
|
|
|
|
p->index = constructor_index;
|
|
|
|
|
|
p->max_index = constructor_max_index;
|
|
|
|
|
|
p->unfilled_index = constructor_unfilled_index;
|
|
|
|
|
|
p->unfilled_fields = constructor_unfilled_fields;
|
|
|
|
|
|
p->bit_index = constructor_bit_index;
|
|
|
|
|
|
p->elements = constructor_elements;
|
|
|
|
|
|
p->constant = constructor_constant;
|
|
|
|
|
|
p->simple = constructor_simple;
|
|
|
|
|
|
p->erroneous = constructor_erroneous;
|
|
|
|
|
|
p->pending_elts = constructor_pending_elts;
|
|
|
|
|
|
p->depth = constructor_depth;
|
2004-07-22 01:46:20 +02:00
|
|
|
|
p->replacement_value.value = 0;
|
|
|
|
|
|
p->replacement_value.original_code = ERROR_MARK;
|
2003-07-18 02:26:51 +02:00
|
|
|
|
p->implicit = implicit;
|
|
|
|
|
|
p->outer = 0;
|
|
|
|
|
|
p->incremental = constructor_incremental;
|
|
|
|
|
|
p->designated = constructor_designated;
|
|
|
|
|
|
p->next = constructor_stack;
|
|
|
|
|
|
p->range_stack = 0;
|
|
|
|
|
|
constructor_stack = p;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
constructor_constant = 1;
|
|
|
|
|
|
constructor_simple = 1;
|
|
|
|
|
|
constructor_depth = SPELLING_DEPTH ();
|
|
|
|
|
|
constructor_elements = 0;
|
|
|
|
|
|
constructor_incremental = 1;
|
|
|
|
|
|
constructor_designated = 0;
|
|
|
|
|
|
constructor_pending_elts = 0;
|
|
|
|
|
|
if (!implicit)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
p->range_stack = constructor_range_stack;
|
|
|
|
|
|
constructor_range_stack = 0;
|
|
|
|
|
|
designator_depth = 0;
|
|
|
|
|
|
designator_errorneous = 0;
|
|
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Don't die if an entire brace-pair level is superfluous
|
|
|
|
|
|
in the containing level. */
|
|
|
|
|
|
if (constructor_type == 0)
|
|
|
|
|
|
;
|
|
|
|
|
|
else if (TREE_CODE (constructor_type) == RECORD_TYPE
|
|
|
|
|
|
|| TREE_CODE (constructor_type) == UNION_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Don't die if there are extra init elts at the end. */
|
|
|
|
|
|
if (constructor_fields == 0)
|
|
|
|
|
|
constructor_type = 0;
|
|
|
|
|
|
else
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
constructor_type = TREE_TYPE (constructor_fields);
|
|
|
|
|
|
push_member_name (constructor_fields);
|
|
|
|
|
|
constructor_depth++;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
}
|
|
|
|
|
|
else if (TREE_CODE (constructor_type) == ARRAY_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
constructor_type = TREE_TYPE (constructor_type);
|
|
|
|
|
|
push_array_bounds (tree_low_cst (constructor_index, 0));
|
|
|
|
|
|
constructor_depth++;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (constructor_type == 0)
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
error_init ("extra brace group at end of initializer");
|
|
|
|
|
|
constructor_fields = 0;
|
|
|
|
|
|
constructor_unfilled_fields = 0;
|
|
|
|
|
|
return;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (value && TREE_CODE (value) == CONSTRUCTOR)
|
|
|
|
|
|
{
|
|
|
|
|
|
constructor_constant = TREE_CONSTANT (value);
|
|
|
|
|
|
constructor_simple = TREE_STATIC (value);
|
|
|
|
|
|
constructor_elements = CONSTRUCTOR_ELTS (value);
|
|
|
|
|
|
if (constructor_elements
|
|
|
|
|
|
&& (TREE_CODE (constructor_type) == RECORD_TYPE
|
|
|
|
|
|
|| TREE_CODE (constructor_type) == ARRAY_TYPE))
|
|
|
|
|
|
set_nonincremental_init ();
|
|
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (implicit == 1 && warn_missing_braces && !missing_braces_mentioned)
|
|
|
|
|
|
{
|
|
|
|
|
|
missing_braces_mentioned = 1;
|
|
|
|
|
|
warning_init ("missing braces around initializer");
|
|
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (TREE_CODE (constructor_type) == RECORD_TYPE
|
|
|
|
|
|
|| TREE_CODE (constructor_type) == UNION_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
constructor_fields = TYPE_FIELDS (constructor_type);
|
|
|
|
|
|
/* Skip any nameless bit fields at the beginning. */
|
|
|
|
|
|
while (constructor_fields != 0 && DECL_C_BIT_FIELD (constructor_fields)
|
|
|
|
|
|
&& DECL_NAME (constructor_fields) == 0)
|
|
|
|
|
|
constructor_fields = TREE_CHAIN (constructor_fields);
|
1993-03-28 07:48:46 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
constructor_unfilled_fields = constructor_fields;
|
|
|
|
|
|
constructor_bit_index = bitsize_zero_node;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (TREE_CODE (constructor_type) == VECTOR_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Vectors are like simple fixed-size arrays. */
|
|
|
|
|
|
constructor_max_index =
|
|
|
|
|
|
build_int_2 (TYPE_VECTOR_SUBPARTS (constructor_type) - 1, 0);
|
|
|
|
|
|
constructor_index = convert (bitsizetype, integer_zero_node);
|
|
|
|
|
|
constructor_unfilled_index = constructor_index;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (TREE_CODE (constructor_type) == ARRAY_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (TYPE_DOMAIN (constructor_type))
|
|
|
|
|
|
{
|
|
|
|
|
|
constructor_max_index
|
|
|
|
|
|
= TYPE_MAX_VALUE (TYPE_DOMAIN (constructor_type));
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Detect non-empty initializations of zero-length arrays. */
|
|
|
|
|
|
if (constructor_max_index == NULL_TREE
|
|
|
|
|
|
&& TYPE_SIZE (constructor_type))
|
|
|
|
|
|
constructor_max_index = build_int_2 (-1, -1);
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* constructor_max_index needs to be an INTEGER_CST. Attempts
|
|
|
|
|
|
to initialize VLAs will cause a proper error; avoid tree
|
|
|
|
|
|
checking errors as well by setting a safe value. */
|
|
|
|
|
|
if (constructor_max_index
|
|
|
|
|
|
&& TREE_CODE (constructor_max_index) != INTEGER_CST)
|
|
|
|
|
|
constructor_max_index = build_int_2 (-1, -1);
|
1993-07-27 07:57:26 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
constructor_index
|
|
|
|
|
|
= convert (bitsizetype,
|
|
|
|
|
|
TYPE_MIN_VALUE (TYPE_DOMAIN (constructor_type)));
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
constructor_index = bitsize_zero_node;
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
constructor_unfilled_index = constructor_index;
|
|
|
|
|
|
if (value && TREE_CODE (value) == STRING_CST)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* We need to split the char/wchar array into individual
|
|
|
|
|
|
characters, so that we don't have to special case it
|
|
|
|
|
|
everywhere. */
|
|
|
|
|
|
set_nonincremental_init_from_string (value);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
warning_init ("braces around scalar initializer");
|
|
|
|
|
|
constructor_fields = constructor_type;
|
|
|
|
|
|
constructor_unfilled_fields = constructor_type;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* At the end of an implicit or explicit brace level,
|
2004-07-22 01:46:20 +02:00
|
|
|
|
finish up that level of constructor. If a single expression
|
|
|
|
|
|
with redundant braces initialized that level, return the
|
|
|
|
|
|
c_expr structure for that expression. Otherwise, the original_code
|
|
|
|
|
|
element is set to ERROR_MARK.
|
|
|
|
|
|
If we were outputting the elements as they are read, return 0 as the value
|
2003-07-18 02:26:51 +02:00
|
|
|
|
from inner levels (process_init_element ignores that),
|
2004-07-22 01:46:20 +02:00
|
|
|
|
but return error_mark_node as the value from the outermost level
|
2003-07-18 02:26:51 +02:00
|
|
|
|
(that's what we want to put in DECL_INITIAL).
|
2004-07-22 01:46:20 +02:00
|
|
|
|
Otherwise, return a CONSTRUCTOR expression as the value. */
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2004-07-22 01:46:20 +02:00
|
|
|
|
struct c_expr
|
2003-07-18 02:26:51 +02:00
|
|
|
|
pop_init_level (int implicit)
|
|
|
|
|
|
{
|
|
|
|
|
|
struct constructor_stack *p;
|
2004-07-22 01:46:20 +02:00
|
|
|
|
struct c_expr ret;
|
|
|
|
|
|
ret.value = 0;
|
|
|
|
|
|
ret.original_code = ERROR_MARK;
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (implicit == 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* When we come to an explicit close brace,
|
|
|
|
|
|
pop any inner levels that didn't have explicit braces. */
|
|
|
|
|
|
while (constructor_stack->implicit)
|
|
|
|
|
|
process_init_element (pop_init_level (1));
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (constructor_range_stack)
|
|
|
|
|
|
abort ();
|
|
|
|
|
|
}
|
1998-04-04 15:32:39 +02:00
|
|
|
|
|
2004-03-26 01:46:53 +01:00
|
|
|
|
/* Now output all pending elements. */
|
|
|
|
|
|
constructor_incremental = 1;
|
|
|
|
|
|
output_pending_init_elements (1);
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
p = constructor_stack;
|
1998-04-04 15:32:39 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Error for initializing a flexible array member, or a zero-length
|
|
|
|
|
|
array member in an inappropriate context. */
|
|
|
|
|
|
if (constructor_type && constructor_fields
|
|
|
|
|
|
&& TREE_CODE (constructor_type) == ARRAY_TYPE
|
|
|
|
|
|
&& TYPE_DOMAIN (constructor_type)
|
|
|
|
|
|
&& ! TYPE_MAX_VALUE (TYPE_DOMAIN (constructor_type)))
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Silently discard empty initializations. The parser will
|
|
|
|
|
|
already have pedwarned for empty brackets. */
|
|
|
|
|
|
if (integer_zerop (constructor_unfilled_index))
|
|
|
|
|
|
constructor_type = NULL_TREE;
|
|
|
|
|
|
else if (! TYPE_SIZE (constructor_type))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (constructor_depth > 2)
|
|
|
|
|
|
error_init ("initialization of flexible array member in a nested context");
|
|
|
|
|
|
else if (pedantic)
|
|
|
|
|
|
pedwarn_init ("initialization of a flexible array member");
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* We have already issued an error message for the existence
|
|
|
|
|
|
of a flexible array member not at the end of the structure.
|
|
|
|
|
|
Discard the initializer so that we do not abort later. */
|
|
|
|
|
|
if (TREE_CHAIN (constructor_fields) != NULL_TREE)
|
|
|
|
|
|
constructor_type = NULL_TREE;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
/* Zero-length arrays are no longer special, so we should no longer
|
|
|
|
|
|
get here. */
|
|
|
|
|
|
abort ();
|
|
|
|
|
|
}
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Warn when some struct elements are implicitly initialized to zero. */
|
|
|
|
|
|
if (extra_warnings
|
|
|
|
|
|
&& constructor_type
|
|
|
|
|
|
&& TREE_CODE (constructor_type) == RECORD_TYPE
|
|
|
|
|
|
&& constructor_unfilled_fields)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Do not warn for flexible array members or zero-length arrays. */
|
|
|
|
|
|
while (constructor_unfilled_fields
|
|
|
|
|
|
&& (! DECL_SIZE (constructor_unfilled_fields)
|
|
|
|
|
|
|| integer_zerop (DECL_SIZE (constructor_unfilled_fields))))
|
|
|
|
|
|
constructor_unfilled_fields = TREE_CHAIN (constructor_unfilled_fields);
|
1993-09-11 22:06:48 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Do not warn if this level of the initializer uses member
|
|
|
|
|
|
designators; it is likely to be deliberate. */
|
|
|
|
|
|
if (constructor_unfilled_fields && !constructor_designated)
|
|
|
|
|
|
{
|
|
|
|
|
|
push_member_name (constructor_unfilled_fields);
|
|
|
|
|
|
warning_init ("missing initializer");
|
|
|
|
|
|
RESTORE_SPELLING_DEPTH (constructor_depth);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Pad out the end of the structure. */
|
2004-07-22 01:46:20 +02:00
|
|
|
|
if (p->replacement_value.value)
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* If this closes a superfluous brace pair,
|
|
|
|
|
|
just pass out the element between them. */
|
2004-07-22 01:46:20 +02:00
|
|
|
|
ret = p->replacement_value;
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else if (constructor_type == 0)
|
|
|
|
|
|
;
|
|
|
|
|
|
else if (TREE_CODE (constructor_type) != RECORD_TYPE
|
|
|
|
|
|
&& TREE_CODE (constructor_type) != UNION_TYPE
|
|
|
|
|
|
&& TREE_CODE (constructor_type) != ARRAY_TYPE
|
|
|
|
|
|
&& TREE_CODE (constructor_type) != VECTOR_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* A nonincremental scalar initializer--just return
|
|
|
|
|
|
the element, after verifying there is just one. */
|
|
|
|
|
|
if (constructor_elements == 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (!constructor_erroneous)
|
|
|
|
|
|
error_init ("empty scalar initializer");
|
2004-07-22 01:46:20 +02:00
|
|
|
|
ret.value = error_mark_node;
|
2003-07-18 02:26:51 +02:00
|
|
|
|
}
|
|
|
|
|
|
else if (TREE_CHAIN (constructor_elements) != 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
error_init ("extra elements in scalar initializer");
|
2004-07-22 01:46:20 +02:00
|
|
|
|
ret.value = TREE_VALUE (constructor_elements);
|
2003-07-18 02:26:51 +02:00
|
|
|
|
}
|
|
|
|
|
|
else
|
2004-07-22 01:46:20 +02:00
|
|
|
|
ret.value = TREE_VALUE (constructor_elements);
|
2003-07-18 02:26:51 +02:00
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
if (constructor_erroneous)
|
2004-07-22 01:46:20 +02:00
|
|
|
|
ret.value = error_mark_node;
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else
|
|
|
|
|
|
{
|
2004-07-22 01:46:20 +02:00
|
|
|
|
ret.value = build_constructor (constructor_type,
|
|
|
|
|
|
nreverse (constructor_elements));
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (constructor_constant)
|
2004-07-22 01:46:20 +02:00
|
|
|
|
TREE_CONSTANT (ret.value) = TREE_INVARIANT (ret.value) = 1;
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (constructor_constant && constructor_simple)
|
2004-07-22 01:46:20 +02:00
|
|
|
|
TREE_STATIC (ret.value) = 1;
|
2003-07-18 02:26:51 +02:00
|
|
|
|
}
|
|
|
|
|
|
}
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
constructor_type = p->type;
|
|
|
|
|
|
constructor_fields = p->fields;
|
|
|
|
|
|
constructor_index = p->index;
|
|
|
|
|
|
constructor_max_index = p->max_index;
|
|
|
|
|
|
constructor_unfilled_index = p->unfilled_index;
|
|
|
|
|
|
constructor_unfilled_fields = p->unfilled_fields;
|
|
|
|
|
|
constructor_bit_index = p->bit_index;
|
|
|
|
|
|
constructor_elements = p->elements;
|
|
|
|
|
|
constructor_constant = p->constant;
|
|
|
|
|
|
constructor_simple = p->simple;
|
|
|
|
|
|
constructor_erroneous = p->erroneous;
|
|
|
|
|
|
constructor_incremental = p->incremental;
|
|
|
|
|
|
constructor_designated = p->designated;
|
|
|
|
|
|
constructor_pending_elts = p->pending_elts;
|
|
|
|
|
|
constructor_depth = p->depth;
|
|
|
|
|
|
if (!p->implicit)
|
|
|
|
|
|
constructor_range_stack = p->range_stack;
|
|
|
|
|
|
RESTORE_SPELLING_DEPTH (constructor_depth);
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
constructor_stack = p->next;
|
|
|
|
|
|
free (p);
|
2001-10-24 22:10:53 +02:00
|
|
|
|
|
2004-07-22 01:46:20 +02:00
|
|
|
|
if (ret.value == 0)
|
2003-07-18 02:26:51 +02:00
|
|
|
|
{
|
|
|
|
|
|
if (constructor_stack == 0)
|
2004-07-22 01:46:20 +02:00
|
|
|
|
{
|
|
|
|
|
|
ret.value = error_mark_node;
|
|
|
|
|
|
return ret;
|
|
|
|
|
|
}
|
|
|
|
|
|
return ret;
|
2003-07-18 02:26:51 +02:00
|
|
|
|
}
|
2004-07-22 01:46:20 +02:00
|
|
|
|
return ret;
|
2003-07-18 02:26:51 +02:00
|
|
|
|
}
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Common handling for both array range and field name designators.
|
|
|
|
|
|
ARRAY argument is nonzero for array ranges. Returns zero for success. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
static int
|
|
|
|
|
|
set_designator (int array)
|
1993-07-23 20:49:55 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
tree subtype;
|
|
|
|
|
|
enum tree_code subcode;
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Don't die if an entire brace-pair level is superfluous
|
|
|
|
|
|
in the containing level. */
|
|
|
|
|
|
if (constructor_type == 0)
|
|
|
|
|
|
return 1;
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* If there were errors in this designator list already, bail out silently. */
|
|
|
|
|
|
if (designator_errorneous)
|
|
|
|
|
|
return 1;
|
1993-07-24 07:41:45 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (!designator_depth)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (constructor_range_stack)
|
|
|
|
|
|
abort ();
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Designator list starts at the level of closest explicit
|
|
|
|
|
|
braces. */
|
|
|
|
|
|
while (constructor_stack->implicit)
|
|
|
|
|
|
process_init_element (pop_init_level (1));
|
|
|
|
|
|
constructor_designated = 1;
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
}
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (constructor_no_implicit)
|
|
|
|
|
|
{
|
|
|
|
|
|
error_init ("initialization designators may not nest");
|
|
|
|
|
|
return 1;
|
|
|
|
|
|
}
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (TREE_CODE (constructor_type) == RECORD_TYPE
|
|
|
|
|
|
|| TREE_CODE (constructor_type) == UNION_TYPE)
|
1992-08-17 20:31:29 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
subtype = TREE_TYPE (constructor_fields);
|
|
|
|
|
|
if (subtype != error_mark_node)
|
|
|
|
|
|
subtype = TYPE_MAIN_VARIANT (subtype);
|
1992-08-17 20:31:29 +02:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else if (TREE_CODE (constructor_type) == ARRAY_TYPE)
|
1993-07-23 20:49:55 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
subtype = TYPE_MAIN_VARIANT (TREE_TYPE (constructor_type));
|
1993-07-23 20:49:55 +02:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else
|
|
|
|
|
|
abort ();
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
subcode = TREE_CODE (subtype);
|
|
|
|
|
|
if (array && subcode != ARRAY_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
error_init ("array index in non-array initializer");
|
|
|
|
|
|
return 1;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (!array && subcode != RECORD_TYPE && subcode != UNION_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
error_init ("field name not in record or union initializer");
|
|
|
|
|
|
return 1;
|
|
|
|
|
|
}
|
1992-03-14 06:07:15 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
constructor_designated = 1;
|
|
|
|
|
|
push_init_level (2);
|
|
|
|
|
|
return 0;
|
1993-07-23 20:49:55 +02:00
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* If there are range designators in designator list, push a new designator
|
|
|
|
|
|
to constructor_range_stack. RANGE_END is end of such stack range or
|
|
|
|
|
|
NULL_TREE if there is no range designator at this level. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
static void
|
|
|
|
|
|
push_range_stack (tree range_end)
|
|
|
|
|
|
{
|
|
|
|
|
|
struct constructor_range_stack *p;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-19 16:47:15 +02:00
|
|
|
|
p = ggc_alloc (sizeof (struct constructor_range_stack));
|
2003-07-18 02:26:51 +02:00
|
|
|
|
p->prev = constructor_range_stack;
|
|
|
|
|
|
p->next = 0;
|
|
|
|
|
|
p->fields = constructor_fields;
|
|
|
|
|
|
p->range_start = constructor_index;
|
|
|
|
|
|
p->index = constructor_index;
|
|
|
|
|
|
p->stack = constructor_stack;
|
|
|
|
|
|
p->range_end = range_end;
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
if (constructor_range_stack)
|
2003-07-18 02:26:51 +02:00
|
|
|
|
constructor_range_stack->next = p;
|
|
|
|
|
|
constructor_range_stack = p;
|
1993-07-23 20:49:55 +02:00
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Within an array initializer, specify the next index to be initialized.
|
|
|
|
|
|
FIRST is that index. If LAST is nonzero, then initialize a range
|
|
|
|
|
|
of indices, running from FIRST through LAST. */
|
1992-06-26 14:54:41 +02:00
|
|
|
|
|
1993-07-23 20:49:55 +02:00
|
|
|
|
void
|
2003-07-18 02:26:51 +02:00
|
|
|
|
set_init_index (tree first, tree last)
|
1993-07-23 20:49:55 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (set_designator (1))
|
|
|
|
|
|
return;
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
designator_errorneous = 1;
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2004-07-22 01:51:29 +02:00
|
|
|
|
if (!INTEGRAL_TYPE_P (TREE_TYPE (first))
|
|
|
|
|
|
|| (last && !INTEGRAL_TYPE_P (TREE_TYPE (last))))
|
|
|
|
|
|
{
|
|
|
|
|
|
error_init ("array index in initializer not of integer type");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
while ((TREE_CODE (first) == NOP_EXPR
|
|
|
|
|
|
|| TREE_CODE (first) == CONVERT_EXPR
|
|
|
|
|
|
|| TREE_CODE (first) == NON_LVALUE_EXPR)
|
|
|
|
|
|
&& (TYPE_MODE (TREE_TYPE (first))
|
|
|
|
|
|
== TYPE_MODE (TREE_TYPE (TREE_OPERAND (first, 0)))))
|
|
|
|
|
|
first = TREE_OPERAND (first, 0);
|
2003-02-25 18:06:41 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (last)
|
|
|
|
|
|
while ((TREE_CODE (last) == NOP_EXPR
|
|
|
|
|
|
|| TREE_CODE (last) == CONVERT_EXPR
|
|
|
|
|
|
|| TREE_CODE (last) == NON_LVALUE_EXPR)
|
|
|
|
|
|
&& (TYPE_MODE (TREE_TYPE (last))
|
|
|
|
|
|
== TYPE_MODE (TREE_TYPE (TREE_OPERAND (last, 0)))))
|
|
|
|
|
|
last = TREE_OPERAND (last, 0);
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (TREE_CODE (first) != INTEGER_CST)
|
|
|
|
|
|
error_init ("nonconstant array index in initializer");
|
|
|
|
|
|
else if (last != 0 && TREE_CODE (last) != INTEGER_CST)
|
|
|
|
|
|
error_init ("nonconstant array index in initializer");
|
|
|
|
|
|
else if (TREE_CODE (constructor_type) != ARRAY_TYPE)
|
|
|
|
|
|
error_init ("array index in non-array initializer");
|
2003-08-19 03:36:29 +02:00
|
|
|
|
else if (tree_int_cst_sgn (first) == -1)
|
|
|
|
|
|
error_init ("array index in initializer exceeds array bounds");
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else if (constructor_max_index
|
|
|
|
|
|
&& tree_int_cst_lt (constructor_max_index, first))
|
|
|
|
|
|
error_init ("array index in initializer exceeds array bounds");
|
|
|
|
|
|
else
|
1993-07-23 20:49:55 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
constructor_index = convert (bitsizetype, first);
|
* Clean up usages of TREE_INT_CST_LOW.
* c-parse.in (RESTORE_WARN_FLAGS): Use tree_low_cst.
* c-parse.y, c-parse.c, objc/objc-parse.y, objc/objc-parse.c:
Regenerated.
* c-tree.h (min_precision): Move declaration to here.
* c-typeck.c (build_binary_op): Use host_integerp and tree_low_cst.
(build_unary_op, add_pending_init): Use bit_position.
(pending_init_member, process_init_element): Likewise.
(really_start_incremental_init, push_init_level, pop_init_level):
Don't make copies of nodes or modify them in place, use consistent
types when tracking positions, and use tree routines computations.
(set_init_index, output_init_element): Likewise.
(output_pending_init_elements, process_init_element): Likewise.
* dbxout.c (dbxout_type_fields): Use bit_position, host_integerp,
tree_low_cst and int_bit_position; also minor cleanup.
(dbxout_type_method_1, dbxout_range_type, dbxout_type): Likewise.
(print_cst_octal): Precision is unsigned.
(dbxout_symbol): Ensure DECL_INITIAL is in-range and use tree_low_cst.
* dwarf2out.c (ceiling): Input and output are unsigned HOST_WIDE_INT.
(simple_type_align_in_bits): Result is unsigned int.
Use tree_int_low_cst and host_integerp.
(simple_type_size_in_bits): Result is unsigned HOST_WIDE_INT.
(field_byte_offset): Result is HOST_WIDE_INT.
Change types of internal variables so alignments are unsigned int,
offsets are HOST_WIDE_INT and sizes are unsigned HOST_WIDE_INT.
Use host_integerp, tree_low_cst, and int_bit_position.
(add_bit_offset_attribute): Likewise.
(add_data_member_location_attribute): Use tree_cst_low.
(add_bound_info): Use host_integerp, integer_zerop, and integer_onep.
(add_bit_size_attribute): Use tree_low_cst.
(add_pure_or_virtual_attribute, gen_enumeration_type_die): Likewise.
* dwarfout.c: Similar changes to dwarf2out.c.
* expr.c (expand_expr, case ARRAY_REF): Remove redundant code.
* genoutput.c (n_occurences): Return -1 for null string.
(strip_whitespace): Accept null string and make into function.
(scan_operands): Reflect above changes.
* sdbout.c (plain_type_1): Use host_integerp and tree_low_cst.
(sdbout_field_types, sdbout_one_type): Likewise; also use bit_position.
* ssa.c (rename_registers): Add missing cast of arg to bzero.
* tree.c (int_size_in_bytes): Check for too big to represent.
(bit_position, int_bit_position, host_integerp, tree_low_cst): New fns.
* tree.h (host_integerp, tree_low_cst, bit_position, int_bit_position):
New declarations.
(min_precision): Delete from here.
* varasm.c (decode_addr_const): Use host_integerp, bit_position,
and int_bit_position.
* objc/objc-act.c (encode_method_prototype): Sizes are HOST_WIDE_INT.
(encode_method_def): Likewise.
(build_ivar_list_initializer): Use int_bit_position.
(generate_shared_structures): Convert size.
(encode_type, encode_complete_bitfield): Use integer_zerop.
(encode_bitfield): Use tree_low_cst and int_bit_position.
* ch/typeck.c (min_precision): New function.
(build_chill_slice): Use host_integerp and tree_low_cst.
(expand_constant_to_buffer): Likewise and also int_bit_position.
LO is unsigned HOST_WIDE_INT
(build_chill_array_ref_1): Make `i' be HOST_WIDE_INT; use tree_low_cst.
(extract_constant_from_buffer): Sizes are now HOST_WIDE_INT.
Use host_integerp and tree_low_cst.
(build_chill_bin_type): Use host_integerp and tree_low_cst.
(layout_chill_range_type): Use tree_int_cst_sgn, compare_tree_int,
tree_low_cst, and min_precision.
(apply_chill_array_layout): Cleanups for types of variables
and use tree_int_cst_sgn, compare_tree_int, and tree_low_cst.
(apply_chill_field_layout): Likewise.
* cp/class.c (build_vbase_path): Use integer_zerop.
(build_vtable_entry): Use tree_low_cst.
(get_vfield_offset): Use bit_position.
(dfs_modify_vtables): New variable vindex_val; `i' is HOST_WIDE_INT.
Use tree_low_cst.
(check_bitfield_decl): Set DECL_SIZE using convert.
(build_base_field): Set DECL_SIZE and DECL_SIZE_UNIT using size_binop.
(layout_virtual_bases): DSIZE is unsigned HOST_WIDE_INT.
Use tree_low_cst.
(finish_struct_1): Use bit_position.
(dump_class_hierarchy): Use tree_low_cst.
* cp/cp-tree.h (min_precision): Add declaration.
* cp/decl.c (xref_tag, xref_basetypes): Use tree_low_cst.
* cp/error.c (dump_type_suffix): Use host_integerp and tree_low_cst.
(dump_expr): Use integer_zerop, host_integerp, and tree_low_cst.
* cp/expr.c (cplus_expand_constant): Use bit_position.
* cp/init.c (build_vec_init): Use host_integerp and tree_low_cst.
* cp/rtti.c (get_base_offset): Use bit_position.
* cp/typeck.c (build_binary_op): Use integer_zerop, compare_tree_int,
host_integerp, and tree_low_cst.
(pointer_int_sum): Use integer_zerop.
(build_component_addr): Use bit_position.
* java/class.c (make_field_value): Properly handle sizes.
(get_dispatch_vector): Use tree_low_cst and host_integerp.
(layout_class_method): Count using trees.
* java/decl.c (push_promoted_type): Set TYPE_{MIN,MAX}_VALUE with
copy_node.
* java/expr.c (java_array_data_offset): Use int_bit_position.
(build_newarray, build_anewarray): Use host_integerp and tree_low_cst.
(build_invokevirtual): Use tree_low_cst and do computations with trees.
From-SVN: r32607
2000-03-17 18:31:58 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (last)
|
1993-09-10 03:04:26 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (tree_int_cst_equal (first, last))
|
|
|
|
|
|
last = 0;
|
|
|
|
|
|
else if (tree_int_cst_lt (last, first))
|
|
|
|
|
|
{
|
|
|
|
|
|
error_init ("empty index range in initializer");
|
|
|
|
|
|
last = 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
last = convert (bitsizetype, last);
|
|
|
|
|
|
if (constructor_max_index != 0
|
|
|
|
|
|
&& tree_int_cst_lt (constructor_max_index, last))
|
|
|
|
|
|
{
|
|
|
|
|
|
error_init ("array index range in initializer exceeds array bounds");
|
|
|
|
|
|
last = 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
1993-09-10 03:04:26 +02:00
|
|
|
|
}
|
builtins.c (c_strlen): Use size_diffop and return ssizetype value.
* builtins.c (c_strlen): Use size_diffop and return ssizetype value.
(expand_builtin_strcpy): Pass correct type to size_binop.
(expand_builtin_strcmp): Likewise.
Clean up conditional structure.
* c-decl.c (init_decl_processing): Don't call set_sizetype twice.
(complete_array_type): Don't use size_binop for MAXINDEX.
* c-typeck.c (c_sizeof): Use size_one_node and TYPE_SIZE_UNIT.
(c_sizeof_nowarn, c_size_in_bytes): Likewise.
(c_alignof): Use size_one_node.
(build_unary_op): Pass arg of proper type to size_binop.
(really_start_incremental_init, push_init_level): Use sizetype for
constructor{,_bit,_unfilled}_index.
(pop_init_label, output_init_element): Likewise.
(output_pending_init_elements, process_init_element): Likewise.
* calls.c (compute_argument_block_size): Field VAR is ssizetype.
* expr.c (store_expr): Use size_int.
(store_constructor): Use proper types for size_binop args.
(get_inner_reference, expand_expr, case ARRAY_REF): Likewise.
(expand_expr_unaligned): Likewise.
(string_contant): Return object of sizetype.
* expr.h (SUB_PARM_SIZE): Call size_diffop and pass proper types.
(ARGS_SIZE_RTX): Call ARGS_SIZE_TREE.
(ARGS_SIZE_TREE): Pass proper types to size_binop.
* fold-const.c (int_const_binop): Refine when size_int is called.
(fold_convert): Likewise.
(size_int_wide): Rework to take KIND as arg, only take low order
bits, handle new sizetype_tab datatype, and chain entries in
size_table.
(size_int_type_wide): New function.
(size_binop): Validate types of arguments.
(ssize_binop): Deleted.
(size_diffop): New function.
(extract_muldiv): Only fold division into multiplication for sizetypes.
* function.c (assign_parms): Use size_diffop and make sure
VAR field is of ssizetype; also pass proper type to size_binop.
(locate_and_pad_parm, pad_to_arg_alignment): Likewise.
(round_down): Deleted from here.
* store-layout.c (sizetype_tab): Now an array.
(sizetype_set, early_root_list): New variables.
(variable_size): Use size_one_node.
(round_up): Pass proper type to size_binop.
(round_down): Moved to here and corrected as above.
(layout_record): Pass proper arg types to size_binop.
(layout_type): Likewise.
If sizetype_set is zero, record the type just laid out.
(make_unsigned_type): Don't call set_sizetype;
(make_signed_type): Likewise; also, call fixup_signed_type.
(initialize_sizetypes): New function.
(set_sizetype): Make copy of types, set TYPE_IS_SIZETYPE, and
set name of bitsizetype to "bit_size_type".
Fix up type of sizes of all types made before call.
* tm.texi (ROUND_TYPE_SIZE_UNIT): New macro.
* tree.c (fix_sizetype): Deleted.
(build_common_tree_nodes): Call initialize_sizetypes.
(build_common_tree_nodes_2): Don't call fix_sizetype.
* tree.h (TYPE_IS_SIZETYPE): New macro.
(initialize_sizetype): New declaration.
(enum size_type_kind): New type.
(struct sizetype_tab): Deleted.
(sizetype_tab): Now array; adjust sizetype macros.
(size_diffop, size_int_type_wide): New functions.
(size_int_wide): Change number of args and type; access macros changed.
(ssize_int, sbitsize_int): New macros.
* config/i960/i960.h (ROUND_TYPE_SIZE): Use size_int.
(ROUND_TYPE_SIZE_UNIT): New macro.
* ch/actions.c (chill_convert_for_assignment): Don't use size_binop
for things that aren't sizes.
(expand_varying_length_assignment): Likewise.
* ch/convert.c (digest_array_tuple, convert): Likewise.
* ch/typeck.c (build_chill_slice, smash_dummy_type): Likewise.
(build_chill_slice_with_range): Likewise.
(build_chill_slice_with_length): Likewise.
(build_array_from_set): Adjust types for size_binop.
* ch/expr.c (build_concat_expr, build_chill_repetition_op): Likewise.
(build_chill_sizeof): Use TYPE_SIZE_UNIT.
* ch/tree.c (build_string_type): Pass proper type to size_binop.
* cp/class.c (dfs_build_vtable_offset_vtbl_entries): Don't use
size_binop on things that are not sizes; ssize_binop deleted.
Call size_diffop when appropriate.
(dfs_build_vcall_offset_vtbl_entries): Likewise.
(build_primary_vtable, build_secondary_vtable): Likewise.
(dfs_set_offset_for_unshared_vbases, dfs_modify_vtables): Likewise.
Variable I is HOST_WIDE_INT.
(get_vfield_offset): Pass proper types to size_binop.
(size_extra_vtbl_entries, layout_virtual_bases): Likewise.
(finish_struct_1): Likewise.
(skip_rtti_stuff): Arg N is now pointer to signed.
(layout_class_type): Use size_zero_node.
* cp/cp-tree.h (skip_rtti_stuff): Arg N is pointer to signed.
* cp/cvt.c (cp_convert_to_pointer): Pass proper types to size_binop.
* cp/decl.c (complete_arry_type): Pass proper types to size_binop.
(xref_basetypes): BINFO_OFFSET is sizetype.
* cp/error.c (dump_expr): Don't use size_binop non-sizes.
* cp/expr.c (cplus_expand_constant): Pass proper types to size_binop.
* cp/init.c (construct_virtual_bases): Fix type error.
(build_vec_delete_1): Pass proper type to size_binop and don't
fold result.
* cp/lex.c (cp_make_lang_type): BINFO_OFFSET is sizetype.
* cp/rtti.c (get_base_offset): Pass proper type to size_binop.
* cp/search.c (dfs_find_vbases): Fix type error.
(expand_upcast_fixups): Arg to skip_rtti_stuff is pointer to signed.
(dfs_get_vbase_types): BINFO_OFFSET is sizetype.
* cp/tree.c (debug_binfo): Variable N is signed.
Use HOST_WIDE_INT_PRINT_DEC.
* cp/typeck.c (comptypes): sizetype is same as equivalent integer type.
(c_sizeof, c_sizeof_nowarn, expr_sizeof): Use TYPE_SIZE_UNIT,
size_one_node and size_zero_node.
(c_alignof): Use size_one_node.
(build_component_addr): Pass proper types to size_binop.
(expand_ptrmemfunc_cst): Don't use size_binop on non-sizes.
* f/com.c (ffecom_arrayref_): Convert args to size_binop to proper
type.
(ffecom_tree_canonize_ptr_): Don't use size_binop for non-sizes.
(ffecom_tree_canonize_ref_): Likewise.
(type_for_mode): Handle TImode.
* f/ste.c (ffeste_io_dofio_, ffeste_io_douio_): Use TYPE_SIZE_UNIT.
(ffeste_io_ciclist_): Likewise.
* java/expr.c (build_java_ret): Pass proper type to size_binop.
From-SVN: r32225
2000-02-27 22:39:40 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
designator_depth++;
|
|
|
|
|
|
designator_errorneous = 0;
|
|
|
|
|
|
if (constructor_range_stack || last)
|
|
|
|
|
|
push_range_stack (last);
|
1993-07-23 20:49:55 +02:00
|
|
|
|
}
|
|
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
|
|
|
|
|
|
/* Within a struct initializer, specify the next field to be initialized. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
1993-07-23 20:49:55 +02:00
|
|
|
|
void
|
2003-07-18 02:26:51 +02:00
|
|
|
|
set_init_label (tree fieldname)
|
1993-07-23 20:49:55 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
tree tail;
|
1993-09-13 22:19:42 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (set_designator (0))
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
designator_errorneous = 1;
|
|
|
|
|
|
|
|
|
|
|
|
if (TREE_CODE (constructor_type) != RECORD_TYPE
|
|
|
|
|
|
&& TREE_CODE (constructor_type) != UNION_TYPE)
|
1993-09-13 22:19:42 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
error_init ("field name not in record or union initializer");
|
|
|
|
|
|
return;
|
1993-09-13 22:19:42 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
for (tail = TYPE_FIELDS (constructor_type); tail;
|
|
|
|
|
|
tail = TREE_CHAIN (tail))
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (DECL_NAME (tail) == fieldname)
|
|
|
|
|
|
break;
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (tail == 0)
|
|
|
|
|
|
error ("unknown field `%s' specified in initializer",
|
|
|
|
|
|
IDENTIFIER_POINTER (fieldname));
|
|
|
|
|
|
else
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
constructor_fields = tail;
|
|
|
|
|
|
designator_depth++;
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
designator_errorneous = 0;
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (constructor_range_stack)
|
|
|
|
|
|
push_range_stack (NULL_TREE);
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Add a new initializer to the tree of pending initializers. PURPOSE
|
|
|
|
|
|
identifies the initializer, either array index or field in a structure.
|
|
|
|
|
|
VALUE is the value of that index or field. */
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
static void
|
|
|
|
|
|
add_pending_init (tree purpose, tree value)
|
|
|
|
|
|
{
|
|
|
|
|
|
struct init_node *p, **q, *r;
|
|
|
|
|
|
|
|
|
|
|
|
q = &constructor_pending_elts;
|
|
|
|
|
|
p = 0;
|
|
|
|
|
|
|
|
|
|
|
|
if (TREE_CODE (constructor_type) == ARRAY_TYPE)
|
1993-07-23 20:49:55 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
while (*q != 0)
|
1993-09-08 11:56:15 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
p = *q;
|
|
|
|
|
|
if (tree_int_cst_lt (purpose, p->purpose))
|
|
|
|
|
|
q = &p->left;
|
|
|
|
|
|
else if (tree_int_cst_lt (p->purpose, purpose))
|
|
|
|
|
|
q = &p->right;
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
if (TREE_SIDE_EFFECTS (p->value))
|
|
|
|
|
|
warning_init ("initialized field with side-effects overwritten");
|
|
|
|
|
|
p->value = value;
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
1993-09-08 11:56:15 +02:00
|
|
|
|
}
|
1993-07-23 20:49:55 +02:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else
|
1993-07-23 20:49:55 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
tree bitpos;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
bitpos = bit_position (purpose);
|
|
|
|
|
|
while (*q != NULL)
|
|
|
|
|
|
{
|
|
|
|
|
|
p = *q;
|
|
|
|
|
|
if (tree_int_cst_lt (bitpos, bit_position (p->purpose)))
|
|
|
|
|
|
q = &p->left;
|
|
|
|
|
|
else if (p->purpose != purpose)
|
|
|
|
|
|
q = &p->right;
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
if (TREE_SIDE_EFFECTS (p->value))
|
|
|
|
|
|
warning_init ("initialized field with side-effects overwritten");
|
|
|
|
|
|
p->value = value;
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
1993-09-08 11:56:15 +02:00
|
|
|
|
}
|
1993-12-16 00:30:48 +01:00
|
|
|
|
|
2003-07-19 16:47:15 +02:00
|
|
|
|
r = ggc_alloc (sizeof (struct init_node));
|
2003-07-18 02:26:51 +02:00
|
|
|
|
r->purpose = purpose;
|
|
|
|
|
|
r->value = value;
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
*q = r;
|
|
|
|
|
|
r->parent = p;
|
|
|
|
|
|
r->left = 0;
|
|
|
|
|
|
r->right = 0;
|
|
|
|
|
|
r->balance = 0;
|
1993-12-16 00:30:48 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
while (p)
|
1993-07-23 20:49:55 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
struct init_node *s;
|
* Clean up usages of TREE_INT_CST_LOW.
* c-parse.in (RESTORE_WARN_FLAGS): Use tree_low_cst.
* c-parse.y, c-parse.c, objc/objc-parse.y, objc/objc-parse.c:
Regenerated.
* c-tree.h (min_precision): Move declaration to here.
* c-typeck.c (build_binary_op): Use host_integerp and tree_low_cst.
(build_unary_op, add_pending_init): Use bit_position.
(pending_init_member, process_init_element): Likewise.
(really_start_incremental_init, push_init_level, pop_init_level):
Don't make copies of nodes or modify them in place, use consistent
types when tracking positions, and use tree routines computations.
(set_init_index, output_init_element): Likewise.
(output_pending_init_elements, process_init_element): Likewise.
* dbxout.c (dbxout_type_fields): Use bit_position, host_integerp,
tree_low_cst and int_bit_position; also minor cleanup.
(dbxout_type_method_1, dbxout_range_type, dbxout_type): Likewise.
(print_cst_octal): Precision is unsigned.
(dbxout_symbol): Ensure DECL_INITIAL is in-range and use tree_low_cst.
* dwarf2out.c (ceiling): Input and output are unsigned HOST_WIDE_INT.
(simple_type_align_in_bits): Result is unsigned int.
Use tree_int_low_cst and host_integerp.
(simple_type_size_in_bits): Result is unsigned HOST_WIDE_INT.
(field_byte_offset): Result is HOST_WIDE_INT.
Change types of internal variables so alignments are unsigned int,
offsets are HOST_WIDE_INT and sizes are unsigned HOST_WIDE_INT.
Use host_integerp, tree_low_cst, and int_bit_position.
(add_bit_offset_attribute): Likewise.
(add_data_member_location_attribute): Use tree_cst_low.
(add_bound_info): Use host_integerp, integer_zerop, and integer_onep.
(add_bit_size_attribute): Use tree_low_cst.
(add_pure_or_virtual_attribute, gen_enumeration_type_die): Likewise.
* dwarfout.c: Similar changes to dwarf2out.c.
* expr.c (expand_expr, case ARRAY_REF): Remove redundant code.
* genoutput.c (n_occurences): Return -1 for null string.
(strip_whitespace): Accept null string and make into function.
(scan_operands): Reflect above changes.
* sdbout.c (plain_type_1): Use host_integerp and tree_low_cst.
(sdbout_field_types, sdbout_one_type): Likewise; also use bit_position.
* ssa.c (rename_registers): Add missing cast of arg to bzero.
* tree.c (int_size_in_bytes): Check for too big to represent.
(bit_position, int_bit_position, host_integerp, tree_low_cst): New fns.
* tree.h (host_integerp, tree_low_cst, bit_position, int_bit_position):
New declarations.
(min_precision): Delete from here.
* varasm.c (decode_addr_const): Use host_integerp, bit_position,
and int_bit_position.
* objc/objc-act.c (encode_method_prototype): Sizes are HOST_WIDE_INT.
(encode_method_def): Likewise.
(build_ivar_list_initializer): Use int_bit_position.
(generate_shared_structures): Convert size.
(encode_type, encode_complete_bitfield): Use integer_zerop.
(encode_bitfield): Use tree_low_cst and int_bit_position.
* ch/typeck.c (min_precision): New function.
(build_chill_slice): Use host_integerp and tree_low_cst.
(expand_constant_to_buffer): Likewise and also int_bit_position.
LO is unsigned HOST_WIDE_INT
(build_chill_array_ref_1): Make `i' be HOST_WIDE_INT; use tree_low_cst.
(extract_constant_from_buffer): Sizes are now HOST_WIDE_INT.
Use host_integerp and tree_low_cst.
(build_chill_bin_type): Use host_integerp and tree_low_cst.
(layout_chill_range_type): Use tree_int_cst_sgn, compare_tree_int,
tree_low_cst, and min_precision.
(apply_chill_array_layout): Cleanups for types of variables
and use tree_int_cst_sgn, compare_tree_int, and tree_low_cst.
(apply_chill_field_layout): Likewise.
* cp/class.c (build_vbase_path): Use integer_zerop.
(build_vtable_entry): Use tree_low_cst.
(get_vfield_offset): Use bit_position.
(dfs_modify_vtables): New variable vindex_val; `i' is HOST_WIDE_INT.
Use tree_low_cst.
(check_bitfield_decl): Set DECL_SIZE using convert.
(build_base_field): Set DECL_SIZE and DECL_SIZE_UNIT using size_binop.
(layout_virtual_bases): DSIZE is unsigned HOST_WIDE_INT.
Use tree_low_cst.
(finish_struct_1): Use bit_position.
(dump_class_hierarchy): Use tree_low_cst.
* cp/cp-tree.h (min_precision): Add declaration.
* cp/decl.c (xref_tag, xref_basetypes): Use tree_low_cst.
* cp/error.c (dump_type_suffix): Use host_integerp and tree_low_cst.
(dump_expr): Use integer_zerop, host_integerp, and tree_low_cst.
* cp/expr.c (cplus_expand_constant): Use bit_position.
* cp/init.c (build_vec_init): Use host_integerp and tree_low_cst.
* cp/rtti.c (get_base_offset): Use bit_position.
* cp/typeck.c (build_binary_op): Use integer_zerop, compare_tree_int,
host_integerp, and tree_low_cst.
(pointer_int_sum): Use integer_zerop.
(build_component_addr): Use bit_position.
* java/class.c (make_field_value): Properly handle sizes.
(get_dispatch_vector): Use tree_low_cst and host_integerp.
(layout_class_method): Count using trees.
* java/decl.c (push_promoted_type): Set TYPE_{MIN,MAX}_VALUE with
copy_node.
* java/expr.c (java_array_data_offset): Use int_bit_position.
(build_newarray, build_anewarray): Use host_integerp and tree_low_cst.
(build_invokevirtual): Use tree_low_cst and do computations with trees.
From-SVN: r32607
2000-03-17 18:31:58 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (r == p->left)
|
1993-09-10 03:04:26 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (p->balance == 0)
|
|
|
|
|
|
p->balance = -1;
|
|
|
|
|
|
else if (p->balance < 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (r->balance < 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* L rotation. */
|
|
|
|
|
|
p->left = r->right;
|
|
|
|
|
|
if (p->left)
|
|
|
|
|
|
p->left->parent = p;
|
|
|
|
|
|
r->right = p;
|
2001-09-21 02:27:59 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
p->balance = 0;
|
|
|
|
|
|
r->balance = 0;
|
2001-12-03 01:09:34 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
s = p->parent;
|
|
|
|
|
|
p->parent = r;
|
|
|
|
|
|
r->parent = s;
|
|
|
|
|
|
if (s)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (s->left == p)
|
|
|
|
|
|
s->left = r;
|
|
|
|
|
|
else
|
|
|
|
|
|
s->right = r;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
constructor_pending_elts = r;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
/* LR rotation. */
|
|
|
|
|
|
struct init_node *t = r->right;
|
2001-09-21 02:27:59 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
r->right = t->left;
|
|
|
|
|
|
if (r->right)
|
|
|
|
|
|
r->right->parent = r;
|
|
|
|
|
|
t->left = r;
|
|
|
|
|
|
|
|
|
|
|
|
p->left = t->right;
|
|
|
|
|
|
if (p->left)
|
|
|
|
|
|
p->left->parent = p;
|
|
|
|
|
|
t->right = p;
|
|
|
|
|
|
|
|
|
|
|
|
p->balance = t->balance < 0;
|
|
|
|
|
|
r->balance = -(t->balance > 0);
|
|
|
|
|
|
t->balance = 0;
|
|
|
|
|
|
|
|
|
|
|
|
s = p->parent;
|
|
|
|
|
|
p->parent = t;
|
|
|
|
|
|
r->parent = t;
|
|
|
|
|
|
t->parent = s;
|
|
|
|
|
|
if (s)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (s->left == p)
|
|
|
|
|
|
s->left = t;
|
|
|
|
|
|
else
|
|
|
|
|
|
s->right = t;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
constructor_pending_elts = t;
|
|
|
|
|
|
}
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
/* p->balance == +1; growth of left side balances the node. */
|
|
|
|
|
|
p->balance = 0;
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
1993-09-10 03:04:26 +02:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else /* r == p->right */
|
|
|
|
|
|
{
|
|
|
|
|
|
if (p->balance == 0)
|
|
|
|
|
|
/* Growth propagation from right side. */
|
|
|
|
|
|
p->balance++;
|
|
|
|
|
|
else if (p->balance > 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (r->balance > 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* R rotation. */
|
|
|
|
|
|
p->right = r->left;
|
|
|
|
|
|
if (p->right)
|
|
|
|
|
|
p->right->parent = p;
|
|
|
|
|
|
r->left = p;
|
|
|
|
|
|
|
|
|
|
|
|
p->balance = 0;
|
|
|
|
|
|
r->balance = 0;
|
|
|
|
|
|
|
|
|
|
|
|
s = p->parent;
|
|
|
|
|
|
p->parent = r;
|
|
|
|
|
|
r->parent = s;
|
|
|
|
|
|
if (s)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (s->left == p)
|
|
|
|
|
|
s->left = r;
|
|
|
|
|
|
else
|
|
|
|
|
|
s->right = r;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
constructor_pending_elts = r;
|
|
|
|
|
|
}
|
|
|
|
|
|
else /* r->balance == -1 */
|
|
|
|
|
|
{
|
|
|
|
|
|
/* RL rotation */
|
|
|
|
|
|
struct init_node *t = r->left;
|
|
|
|
|
|
|
|
|
|
|
|
r->left = t->right;
|
|
|
|
|
|
if (r->left)
|
|
|
|
|
|
r->left->parent = r;
|
|
|
|
|
|
t->right = r;
|
|
|
|
|
|
|
|
|
|
|
|
p->right = t->left;
|
|
|
|
|
|
if (p->right)
|
|
|
|
|
|
p->right->parent = p;
|
|
|
|
|
|
t->left = p;
|
|
|
|
|
|
|
|
|
|
|
|
r->balance = (t->balance < 0);
|
|
|
|
|
|
p->balance = -(t->balance > 0);
|
|
|
|
|
|
t->balance = 0;
|
|
|
|
|
|
|
|
|
|
|
|
s = p->parent;
|
|
|
|
|
|
p->parent = t;
|
|
|
|
|
|
r->parent = t;
|
|
|
|
|
|
t->parent = s;
|
|
|
|
|
|
if (s)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (s->left == p)
|
|
|
|
|
|
s->left = t;
|
|
|
|
|
|
else
|
|
|
|
|
|
s->right = t;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
constructor_pending_elts = t;
|
|
|
|
|
|
}
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
/* p->balance == -1; growth of right side balances the node. */
|
|
|
|
|
|
p->balance = 0;
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
r = p;
|
|
|
|
|
|
p = p->parent;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Build AVL tree from a sorted chain. */
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
|
set_nonincremental_init (void)
|
|
|
|
|
|
{
|
|
|
|
|
|
tree chain;
|
|
|
|
|
|
|
|
|
|
|
|
if (TREE_CODE (constructor_type) != RECORD_TYPE
|
|
|
|
|
|
&& TREE_CODE (constructor_type) != ARRAY_TYPE)
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
for (chain = constructor_elements; chain; chain = TREE_CHAIN (chain))
|
|
|
|
|
|
add_pending_init (TREE_PURPOSE (chain), TREE_VALUE (chain));
|
|
|
|
|
|
constructor_elements = 0;
|
|
|
|
|
|
if (TREE_CODE (constructor_type) == RECORD_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
constructor_unfilled_fields = TYPE_FIELDS (constructor_type);
|
|
|
|
|
|
/* Skip any nameless bit fields at the beginning. */
|
|
|
|
|
|
while (constructor_unfilled_fields != 0
|
|
|
|
|
|
&& DECL_C_BIT_FIELD (constructor_unfilled_fields)
|
|
|
|
|
|
&& DECL_NAME (constructor_unfilled_fields) == 0)
|
|
|
|
|
|
constructor_unfilled_fields = TREE_CHAIN (constructor_unfilled_fields);
|
builtins.c (c_strlen): Use size_diffop and return ssizetype value.
* builtins.c (c_strlen): Use size_diffop and return ssizetype value.
(expand_builtin_strcpy): Pass correct type to size_binop.
(expand_builtin_strcmp): Likewise.
Clean up conditional structure.
* c-decl.c (init_decl_processing): Don't call set_sizetype twice.
(complete_array_type): Don't use size_binop for MAXINDEX.
* c-typeck.c (c_sizeof): Use size_one_node and TYPE_SIZE_UNIT.
(c_sizeof_nowarn, c_size_in_bytes): Likewise.
(c_alignof): Use size_one_node.
(build_unary_op): Pass arg of proper type to size_binop.
(really_start_incremental_init, push_init_level): Use sizetype for
constructor{,_bit,_unfilled}_index.
(pop_init_label, output_init_element): Likewise.
(output_pending_init_elements, process_init_element): Likewise.
* calls.c (compute_argument_block_size): Field VAR is ssizetype.
* expr.c (store_expr): Use size_int.
(store_constructor): Use proper types for size_binop args.
(get_inner_reference, expand_expr, case ARRAY_REF): Likewise.
(expand_expr_unaligned): Likewise.
(string_contant): Return object of sizetype.
* expr.h (SUB_PARM_SIZE): Call size_diffop and pass proper types.
(ARGS_SIZE_RTX): Call ARGS_SIZE_TREE.
(ARGS_SIZE_TREE): Pass proper types to size_binop.
* fold-const.c (int_const_binop): Refine when size_int is called.
(fold_convert): Likewise.
(size_int_wide): Rework to take KIND as arg, only take low order
bits, handle new sizetype_tab datatype, and chain entries in
size_table.
(size_int_type_wide): New function.
(size_binop): Validate types of arguments.
(ssize_binop): Deleted.
(size_diffop): New function.
(extract_muldiv): Only fold division into multiplication for sizetypes.
* function.c (assign_parms): Use size_diffop and make sure
VAR field is of ssizetype; also pass proper type to size_binop.
(locate_and_pad_parm, pad_to_arg_alignment): Likewise.
(round_down): Deleted from here.
* store-layout.c (sizetype_tab): Now an array.
(sizetype_set, early_root_list): New variables.
(variable_size): Use size_one_node.
(round_up): Pass proper type to size_binop.
(round_down): Moved to here and corrected as above.
(layout_record): Pass proper arg types to size_binop.
(layout_type): Likewise.
If sizetype_set is zero, record the type just laid out.
(make_unsigned_type): Don't call set_sizetype;
(make_signed_type): Likewise; also, call fixup_signed_type.
(initialize_sizetypes): New function.
(set_sizetype): Make copy of types, set TYPE_IS_SIZETYPE, and
set name of bitsizetype to "bit_size_type".
Fix up type of sizes of all types made before call.
* tm.texi (ROUND_TYPE_SIZE_UNIT): New macro.
* tree.c (fix_sizetype): Deleted.
(build_common_tree_nodes): Call initialize_sizetypes.
(build_common_tree_nodes_2): Don't call fix_sizetype.
* tree.h (TYPE_IS_SIZETYPE): New macro.
(initialize_sizetype): New declaration.
(enum size_type_kind): New type.
(struct sizetype_tab): Deleted.
(sizetype_tab): Now array; adjust sizetype macros.
(size_diffop, size_int_type_wide): New functions.
(size_int_wide): Change number of args and type; access macros changed.
(ssize_int, sbitsize_int): New macros.
* config/i960/i960.h (ROUND_TYPE_SIZE): Use size_int.
(ROUND_TYPE_SIZE_UNIT): New macro.
* ch/actions.c (chill_convert_for_assignment): Don't use size_binop
for things that aren't sizes.
(expand_varying_length_assignment): Likewise.
* ch/convert.c (digest_array_tuple, convert): Likewise.
* ch/typeck.c (build_chill_slice, smash_dummy_type): Likewise.
(build_chill_slice_with_range): Likewise.
(build_chill_slice_with_length): Likewise.
(build_array_from_set): Adjust types for size_binop.
* ch/expr.c (build_concat_expr, build_chill_repetition_op): Likewise.
(build_chill_sizeof): Use TYPE_SIZE_UNIT.
* ch/tree.c (build_string_type): Pass proper type to size_binop.
* cp/class.c (dfs_build_vtable_offset_vtbl_entries): Don't use
size_binop on things that are not sizes; ssize_binop deleted.
Call size_diffop when appropriate.
(dfs_build_vcall_offset_vtbl_entries): Likewise.
(build_primary_vtable, build_secondary_vtable): Likewise.
(dfs_set_offset_for_unshared_vbases, dfs_modify_vtables): Likewise.
Variable I is HOST_WIDE_INT.
(get_vfield_offset): Pass proper types to size_binop.
(size_extra_vtbl_entries, layout_virtual_bases): Likewise.
(finish_struct_1): Likewise.
(skip_rtti_stuff): Arg N is now pointer to signed.
(layout_class_type): Use size_zero_node.
* cp/cp-tree.h (skip_rtti_stuff): Arg N is pointer to signed.
* cp/cvt.c (cp_convert_to_pointer): Pass proper types to size_binop.
* cp/decl.c (complete_arry_type): Pass proper types to size_binop.
(xref_basetypes): BINFO_OFFSET is sizetype.
* cp/error.c (dump_expr): Don't use size_binop non-sizes.
* cp/expr.c (cplus_expand_constant): Pass proper types to size_binop.
* cp/init.c (construct_virtual_bases): Fix type error.
(build_vec_delete_1): Pass proper type to size_binop and don't
fold result.
* cp/lex.c (cp_make_lang_type): BINFO_OFFSET is sizetype.
* cp/rtti.c (get_base_offset): Pass proper type to size_binop.
* cp/search.c (dfs_find_vbases): Fix type error.
(expand_upcast_fixups): Arg to skip_rtti_stuff is pointer to signed.
(dfs_get_vbase_types): BINFO_OFFSET is sizetype.
* cp/tree.c (debug_binfo): Variable N is signed.
Use HOST_WIDE_INT_PRINT_DEC.
* cp/typeck.c (comptypes): sizetype is same as equivalent integer type.
(c_sizeof, c_sizeof_nowarn, expr_sizeof): Use TYPE_SIZE_UNIT,
size_one_node and size_zero_node.
(c_alignof): Use size_one_node.
(build_component_addr): Pass proper types to size_binop.
(expand_ptrmemfunc_cst): Don't use size_binop on non-sizes.
* f/com.c (ffecom_arrayref_): Convert args to size_binop to proper
type.
(ffecom_tree_canonize_ptr_): Don't use size_binop for non-sizes.
(ffecom_tree_canonize_ref_): Likewise.
(type_for_mode): Handle TImode.
* f/ste.c (ffeste_io_dofio_, ffeste_io_douio_): Use TYPE_SIZE_UNIT.
(ffeste_io_ciclist_): Likewise.
* java/expr.c (build_java_ret): Pass proper type to size_binop.
From-SVN: r32225
2000-02-27 22:39:40 +01:00
|
|
|
|
|
1993-07-23 20:49:55 +02:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else if (TREE_CODE (constructor_type) == ARRAY_TYPE)
|
1993-07-23 20:49:55 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (TYPE_DOMAIN (constructor_type))
|
|
|
|
|
|
constructor_unfilled_index
|
|
|
|
|
|
= convert (bitsizetype,
|
|
|
|
|
|
TYPE_MIN_VALUE (TYPE_DOMAIN (constructor_type)));
|
|
|
|
|
|
else
|
|
|
|
|
|
constructor_unfilled_index = bitsize_zero_node;
|
1993-07-23 20:49:55 +02:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
constructor_incremental = 0;
|
1993-07-23 20:49:55 +02:00
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Build AVL tree from a string constant. */
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
static void
|
|
|
|
|
|
set_nonincremental_init_from_string (tree str)
|
1993-07-23 20:49:55 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
tree value, purpose, type;
|
|
|
|
|
|
HOST_WIDE_INT val[2];
|
|
|
|
|
|
const char *p, *end;
|
|
|
|
|
|
int byte, wchar_bytes, charwidth, bitpos;
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (TREE_CODE (constructor_type) != ARRAY_TYPE)
|
|
|
|
|
|
abort ();
|
2001-01-27 21:33:54 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (TYPE_PRECISION (TREE_TYPE (TREE_TYPE (str)))
|
|
|
|
|
|
== TYPE_PRECISION (char_type_node))
|
|
|
|
|
|
wchar_bytes = 1;
|
|
|
|
|
|
else if (TYPE_PRECISION (TREE_TYPE (TREE_TYPE (str)))
|
|
|
|
|
|
== TYPE_PRECISION (wchar_type_node))
|
|
|
|
|
|
wchar_bytes = TYPE_PRECISION (wchar_type_node) / BITS_PER_UNIT;
|
|
|
|
|
|
else
|
|
|
|
|
|
abort ();
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
charwidth = TYPE_PRECISION (char_type_node);
|
|
|
|
|
|
type = TREE_TYPE (constructor_type);
|
|
|
|
|
|
p = TREE_STRING_POINTER (str);
|
|
|
|
|
|
end = p + TREE_STRING_LENGTH (str);
|
1993-09-08 11:56:15 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
for (purpose = bitsize_zero_node;
|
|
|
|
|
|
p < end && !tree_int_cst_lt (constructor_max_index, purpose);
|
|
|
|
|
|
purpose = size_binop (PLUS_EXPR, purpose, bitsize_one_node))
|
2001-01-04 02:14:16 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (wchar_bytes == 1)
|
2001-01-05 06:58:23 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
val[1] = (unsigned char) *p++;
|
|
|
|
|
|
val[0] = 0;
|
2001-01-05 06:58:23 +01:00
|
|
|
|
}
|
|
|
|
|
|
else
|
2003-07-18 02:26:51 +02:00
|
|
|
|
{
|
|
|
|
|
|
val[0] = 0;
|
|
|
|
|
|
val[1] = 0;
|
|
|
|
|
|
for (byte = 0; byte < wchar_bytes; byte++)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (BYTES_BIG_ENDIAN)
|
|
|
|
|
|
bitpos = (wchar_bytes - byte - 1) * charwidth;
|
|
|
|
|
|
else
|
|
|
|
|
|
bitpos = byte * charwidth;
|
|
|
|
|
|
val[bitpos < HOST_BITS_PER_WIDE_INT]
|
|
|
|
|
|
|= ((unsigned HOST_WIDE_INT) ((unsigned char) *p++))
|
|
|
|
|
|
<< (bitpos % HOST_BITS_PER_WIDE_INT);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
2001-01-04 02:14:16 +01:00
|
|
|
|
|
builtins.c, [...]: Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* builtins.c, c-aux-info.c, c-common.c, c-cppbuiltin.c, c-decl.c:
Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* c-format.c, c-opts.c, c-pretty-print.c, c-typeck.c: Likewise.
* calls.c, convert.c, dbxout.c, dojump.c, dwarf2out.c: Likewise.
* expmed.c, expr.c, fold-const.c, function.c, integrate.c: Likewise.
* optabs.c, sdbout.c, stmt.c, stor-layout.c, tree-dump.c: Likewise.
* tree.c, config/iq2000/iq2000.c, config/m32r/m32r.c: Likewise.
* config/mips/mips.c, config/rs6000/rs6000.c: Likewise.
* config/s390/s390.c, config/sparc/sparc.c, objc/objc-act.c: Likewise.
* stor-layout.c (layout_type, case COMPLEX_TYPE): Test for
REAL_TYPE, not INTEGER_TYPE.
(layout_type, case VECTOR_TYPE): Simplify code.
* tree.c (build_vector_type_for_mode): Remove dup unsigned setting.
* tree.h: Update comments.
(STRIP_NOPS): Use TYPE_UNSIGNED.
(TYPE_UNSIGNED): New macro.
(TYPE_TRAP_SIGNED): Remove now redundant check.
(SAVE_EXPR_NOPLACEHOLDER): Don't use TREE_UNSIGNED.
* cp/call.c (joust): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* cp/class.c (check_bitfield_decl): Likewise.
* cp/cvt.c (type_promotes_to): Likewise.
* cp/decl.c (finish_enum): Likewise.
* cp/mangle.c (write_builtin_type): Likewise.
* cp/semantics.c (finish_switch_cond, finish_unary_op_expr): Likewise.
* cp/typeck.c (type_after_usual_arithmetic_conversions): Likewise.
(build_binary_op): Likewise.
* f/com.c (ffecom_arrayref_): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
(ffecom_expr_): Likewise.
* java/jcf-write.c (generate_bytecode_insns): Use TYPE_UNSIGNED.
* treelang/treetree.c (tree_lang_signed_or_unsigned_type):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/decl.c (gnat_to_gnu_entity, make_type_from_size):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/trans.c (tree_transform, convert_with_check): Likewise.
* ada/utils.c (gnat_signed_or_unsigned_type): Likewise.
(build_vms_descriptor, unchecked_convert): Likewise.
* ada/utils2.c (nonbinary_modular_operation): Likewise.
From-SVN: r80287
2004-04-01 05:50:43 +02:00
|
|
|
|
if (!TYPE_UNSIGNED (type))
|
2003-07-18 02:26:51 +02:00
|
|
|
|
{
|
|
|
|
|
|
bitpos = ((wchar_bytes - 1) * charwidth) + HOST_BITS_PER_CHAR;
|
|
|
|
|
|
if (bitpos < HOST_BITS_PER_WIDE_INT)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (val[1] & (((HOST_WIDE_INT) 1) << (bitpos - 1)))
|
|
|
|
|
|
{
|
|
|
|
|
|
val[1] |= ((HOST_WIDE_INT) -1) << bitpos;
|
|
|
|
|
|
val[0] = -1;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (bitpos == HOST_BITS_PER_WIDE_INT)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (val[1] < 0)
|
|
|
|
|
|
val[0] = -1;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (val[0] & (((HOST_WIDE_INT) 1)
|
|
|
|
|
|
<< (bitpos - 1 - HOST_BITS_PER_WIDE_INT)))
|
|
|
|
|
|
val[0] |= ((HOST_WIDE_INT) -1)
|
|
|
|
|
|
<< (bitpos - HOST_BITS_PER_WIDE_INT);
|
|
|
|
|
|
}
|
2001-01-05 06:58:23 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
value = build_int_2 (val[1], val[0]);
|
|
|
|
|
|
TREE_TYPE (value) = type;
|
|
|
|
|
|
add_pending_init (purpose, value);
|
1998-06-20 00:27:35 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
constructor_incremental = 0;
|
|
|
|
|
|
}
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Return value of FIELD in pending initializer or zero if the field was
|
|
|
|
|
|
not initialized yet. */
|
|
|
|
|
|
|
|
|
|
|
|
static tree
|
|
|
|
|
|
find_init_member (tree field)
|
|
|
|
|
|
{
|
|
|
|
|
|
struct init_node *p;
|
|
|
|
|
|
|
|
|
|
|
|
if (TREE_CODE (constructor_type) == ARRAY_TYPE)
|
1993-10-07 00:32:11 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (constructor_incremental
|
|
|
|
|
|
&& tree_int_cst_lt (field, constructor_unfilled_index))
|
|
|
|
|
|
set_nonincremental_init ();
|
|
|
|
|
|
|
|
|
|
|
|
p = constructor_pending_elts;
|
|
|
|
|
|
while (p)
|
1993-10-07 00:32:11 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (tree_int_cst_lt (field, p->purpose))
|
|
|
|
|
|
p = p->left;
|
|
|
|
|
|
else if (tree_int_cst_lt (p->purpose, field))
|
|
|
|
|
|
p = p->right;
|
|
|
|
|
|
else
|
|
|
|
|
|
return p->value;
|
1993-10-07 00:32:11 +01:00
|
|
|
|
}
|
|
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else if (TREE_CODE (constructor_type) == RECORD_TYPE)
|
1993-07-23 20:49:55 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
tree bitpos = bit_position (field);
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (constructor_incremental
|
|
|
|
|
|
&& (!constructor_unfilled_fields
|
|
|
|
|
|
|| tree_int_cst_lt (bitpos,
|
|
|
|
|
|
bit_position (constructor_unfilled_fields))))
|
|
|
|
|
|
set_nonincremental_init ();
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
p = constructor_pending_elts;
|
|
|
|
|
|
while (p)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (field == p->purpose)
|
|
|
|
|
|
return p->value;
|
|
|
|
|
|
else if (tree_int_cst_lt (bitpos, bit_position (p->purpose)))
|
|
|
|
|
|
p = p->left;
|
|
|
|
|
|
else
|
|
|
|
|
|
p = p->right;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (TREE_CODE (constructor_type) == UNION_TYPE)
|
1993-07-23 20:49:55 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (constructor_elements
|
|
|
|
|
|
&& TREE_PURPOSE (constructor_elements) == field)
|
|
|
|
|
|
return TREE_VALUE (constructor_elements);
|
1993-07-23 20:49:55 +02:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
return 0;
|
1993-07-23 20:49:55 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* "Output" the next constructor element.
|
|
|
|
|
|
At top level, really output it to assembler code now.
|
|
|
|
|
|
Otherwise, collect it in a list from which we will make a CONSTRUCTOR.
|
|
|
|
|
|
TYPE is the data type that the containing data type wants here.
|
|
|
|
|
|
FIELD is the field (a FIELD_DECL) or the index that this element fills.
|
2004-07-22 01:46:20 +02:00
|
|
|
|
If VALUE is a string constant, STRICT_STRING is true if it is
|
|
|
|
|
|
unparenthesized or we should not warn here for it being parenthesized.
|
|
|
|
|
|
For other types of VALUE, STRICT_STRING is not used.
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
PENDING if non-nil means output pending elements that belong
|
|
|
|
|
|
right after this element. (PENDING is normally 1;
|
|
|
|
|
|
it is 0 while outputting pending elements, to avoid recursion.) */
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
static void
|
2004-07-22 01:46:20 +02:00
|
|
|
|
output_init_element (tree value, bool strict_string, tree type, tree field,
|
|
|
|
|
|
int pending)
|
2003-07-18 02:26:51 +02:00
|
|
|
|
{
|
|
|
|
|
|
if (type == error_mark_node)
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
constructor_erroneous = 1;
|
|
|
|
|
|
return;
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (TREE_CODE (TREE_TYPE (value)) == FUNCTION_TYPE
|
|
|
|
|
|
|| (TREE_CODE (TREE_TYPE (value)) == ARRAY_TYPE
|
|
|
|
|
|
&& !(TREE_CODE (value) == STRING_CST
|
|
|
|
|
|
&& TREE_CODE (type) == ARRAY_TYPE
|
2004-07-25 11:12:21 +02:00
|
|
|
|
&& INTEGRAL_TYPE_P (TREE_TYPE (type)))
|
2003-07-18 02:26:51 +02:00
|
|
|
|
&& !comptypes (TYPE_MAIN_VARIANT (TREE_TYPE (value)),
|
2004-06-13 19:14:09 +02:00
|
|
|
|
TYPE_MAIN_VARIANT (type))))
|
2003-07-18 02:26:51 +02:00
|
|
|
|
value = default_conversion (value);
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (TREE_CODE (value) == COMPOUND_LITERAL_EXPR
|
|
|
|
|
|
&& require_constant_value && !flag_isoc99 && pending)
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* As an extension, allow initializing objects with static storage
|
|
|
|
|
|
duration with compound literals (which are then treated just as
|
|
|
|
|
|
the brace enclosed list they contain). */
|
|
|
|
|
|
tree decl = COMPOUND_LITERAL_EXPR_DECL (value);
|
|
|
|
|
|
value = DECL_INITIAL (decl);
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (value == error_mark_node)
|
|
|
|
|
|
constructor_erroneous = 1;
|
|
|
|
|
|
else if (!TREE_CONSTANT (value))
|
|
|
|
|
|
constructor_constant = 0;
|
|
|
|
|
|
else if (initializer_constant_valid_p (value, TREE_TYPE (value)) == 0
|
|
|
|
|
|
|| ((TREE_CODE (constructor_type) == RECORD_TYPE
|
|
|
|
|
|
|| TREE_CODE (constructor_type) == UNION_TYPE)
|
|
|
|
|
|
&& DECL_C_BIT_FIELD (field)
|
|
|
|
|
|
&& TREE_CODE (value) != INTEGER_CST))
|
|
|
|
|
|
constructor_simple = 0;
|
|
|
|
|
|
|
|
|
|
|
|
if (require_constant_value && ! TREE_CONSTANT (value))
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
error_init ("initializer element is not constant");
|
|
|
|
|
|
value = error_mark_node;
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else if (require_constant_elements
|
|
|
|
|
|
&& initializer_constant_valid_p (value, TREE_TYPE (value)) == 0)
|
|
|
|
|
|
pedwarn ("initializer element is not computable at load time");
|
|
|
|
|
|
|
|
|
|
|
|
/* If this field is empty (and not at the end of structure),
|
|
|
|
|
|
don't do anything other than checking the initializer. */
|
|
|
|
|
|
if (field
|
|
|
|
|
|
&& (TREE_TYPE (field) == error_mark_node
|
|
|
|
|
|
|| (COMPLETE_TYPE_P (TREE_TYPE (field))
|
|
|
|
|
|
&& integer_zerop (TYPE_SIZE (TREE_TYPE (field)))
|
|
|
|
|
|
&& (TREE_CODE (constructor_type) == ARRAY_TYPE
|
|
|
|
|
|
|| TREE_CHAIN (field)))))
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
2004-07-22 01:46:20 +02:00
|
|
|
|
value = digest_init (type, value, strict_string, require_constant_value);
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (value == error_mark_node)
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
constructor_erroneous = 1;
|
|
|
|
|
|
return;
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* If this element doesn't come next in sequence,
|
|
|
|
|
|
put it on constructor_pending_elts. */
|
|
|
|
|
|
if (TREE_CODE (constructor_type) == ARRAY_TYPE
|
|
|
|
|
|
&& (!constructor_incremental
|
|
|
|
|
|
|| !tree_int_cst_equal (field, constructor_unfilled_index)))
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (constructor_incremental
|
|
|
|
|
|
&& tree_int_cst_lt (field, constructor_unfilled_index))
|
|
|
|
|
|
set_nonincremental_init ();
|
|
|
|
|
|
|
|
|
|
|
|
add_pending_init (field, value);
|
|
|
|
|
|
return;
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else if (TREE_CODE (constructor_type) == RECORD_TYPE
|
|
|
|
|
|
&& (!constructor_incremental
|
|
|
|
|
|
|| field != constructor_unfilled_fields))
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* We do this for records but not for unions. In a union,
|
|
|
|
|
|
no matter which field is specified, it can be initialized
|
|
|
|
|
|
right away since it starts at the beginning of the union. */
|
|
|
|
|
|
if (constructor_incremental)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (!constructor_unfilled_fields)
|
|
|
|
|
|
set_nonincremental_init ();
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
tree bitpos, unfillpos;
|
|
|
|
|
|
|
|
|
|
|
|
bitpos = bit_position (field);
|
|
|
|
|
|
unfillpos = bit_position (constructor_unfilled_fields);
|
|
|
|
|
|
|
|
|
|
|
|
if (tree_int_cst_lt (bitpos, unfillpos))
|
|
|
|
|
|
set_nonincremental_init ();
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
add_pending_init (field, value);
|
|
|
|
|
|
return;
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else if (TREE_CODE (constructor_type) == UNION_TYPE
|
|
|
|
|
|
&& constructor_elements)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (TREE_SIDE_EFFECTS (TREE_VALUE (constructor_elements)))
|
|
|
|
|
|
warning_init ("initialized field with side-effects overwritten");
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* We can have just one union field set. */
|
|
|
|
|
|
constructor_elements = 0;
|
|
|
|
|
|
}
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Otherwise, output this element either to
|
|
|
|
|
|
constructor_elements or to the assembler file. */
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (field && TREE_CODE (field) == INTEGER_CST)
|
|
|
|
|
|
field = copy_node (field);
|
|
|
|
|
|
constructor_elements
|
|
|
|
|
|
= tree_cons (field, value, constructor_elements);
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Advance the variable that indicates sequential elements output. */
|
|
|
|
|
|
if (TREE_CODE (constructor_type) == ARRAY_TYPE)
|
|
|
|
|
|
constructor_unfilled_index
|
|
|
|
|
|
= size_binop (PLUS_EXPR, constructor_unfilled_index,
|
|
|
|
|
|
bitsize_one_node);
|
|
|
|
|
|
else if (TREE_CODE (constructor_type) == RECORD_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
constructor_unfilled_fields
|
|
|
|
|
|
= TREE_CHAIN (constructor_unfilled_fields);
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Skip any nameless bit fields. */
|
|
|
|
|
|
while (constructor_unfilled_fields != 0
|
|
|
|
|
|
&& DECL_C_BIT_FIELD (constructor_unfilled_fields)
|
|
|
|
|
|
&& DECL_NAME (constructor_unfilled_fields) == 0)
|
|
|
|
|
|
constructor_unfilled_fields =
|
|
|
|
|
|
TREE_CHAIN (constructor_unfilled_fields);
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (TREE_CODE (constructor_type) == UNION_TYPE)
|
|
|
|
|
|
constructor_unfilled_fields = 0;
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Now output any pending elements which have become next. */
|
|
|
|
|
|
if (pending)
|
|
|
|
|
|
output_pending_init_elements (0);
|
|
|
|
|
|
}
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Output any pending elements which have become next.
|
|
|
|
|
|
As we output elements, constructor_unfilled_{fields,index}
|
|
|
|
|
|
advances, which may cause other elements to become next;
|
|
|
|
|
|
if so, they too are output.
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
If ALL is 0, we return when there are
|
|
|
|
|
|
no more pending elements to output now.
|
* Clean up usages of TREE_INT_CST_LOW.
* c-parse.in (RESTORE_WARN_FLAGS): Use tree_low_cst.
* c-parse.y, c-parse.c, objc/objc-parse.y, objc/objc-parse.c:
Regenerated.
* c-tree.h (min_precision): Move declaration to here.
* c-typeck.c (build_binary_op): Use host_integerp and tree_low_cst.
(build_unary_op, add_pending_init): Use bit_position.
(pending_init_member, process_init_element): Likewise.
(really_start_incremental_init, push_init_level, pop_init_level):
Don't make copies of nodes or modify them in place, use consistent
types when tracking positions, and use tree routines computations.
(set_init_index, output_init_element): Likewise.
(output_pending_init_elements, process_init_element): Likewise.
* dbxout.c (dbxout_type_fields): Use bit_position, host_integerp,
tree_low_cst and int_bit_position; also minor cleanup.
(dbxout_type_method_1, dbxout_range_type, dbxout_type): Likewise.
(print_cst_octal): Precision is unsigned.
(dbxout_symbol): Ensure DECL_INITIAL is in-range and use tree_low_cst.
* dwarf2out.c (ceiling): Input and output are unsigned HOST_WIDE_INT.
(simple_type_align_in_bits): Result is unsigned int.
Use tree_int_low_cst and host_integerp.
(simple_type_size_in_bits): Result is unsigned HOST_WIDE_INT.
(field_byte_offset): Result is HOST_WIDE_INT.
Change types of internal variables so alignments are unsigned int,
offsets are HOST_WIDE_INT and sizes are unsigned HOST_WIDE_INT.
Use host_integerp, tree_low_cst, and int_bit_position.
(add_bit_offset_attribute): Likewise.
(add_data_member_location_attribute): Use tree_cst_low.
(add_bound_info): Use host_integerp, integer_zerop, and integer_onep.
(add_bit_size_attribute): Use tree_low_cst.
(add_pure_or_virtual_attribute, gen_enumeration_type_die): Likewise.
* dwarfout.c: Similar changes to dwarf2out.c.
* expr.c (expand_expr, case ARRAY_REF): Remove redundant code.
* genoutput.c (n_occurences): Return -1 for null string.
(strip_whitespace): Accept null string and make into function.
(scan_operands): Reflect above changes.
* sdbout.c (plain_type_1): Use host_integerp and tree_low_cst.
(sdbout_field_types, sdbout_one_type): Likewise; also use bit_position.
* ssa.c (rename_registers): Add missing cast of arg to bzero.
* tree.c (int_size_in_bytes): Check for too big to represent.
(bit_position, int_bit_position, host_integerp, tree_low_cst): New fns.
* tree.h (host_integerp, tree_low_cst, bit_position, int_bit_position):
New declarations.
(min_precision): Delete from here.
* varasm.c (decode_addr_const): Use host_integerp, bit_position,
and int_bit_position.
* objc/objc-act.c (encode_method_prototype): Sizes are HOST_WIDE_INT.
(encode_method_def): Likewise.
(build_ivar_list_initializer): Use int_bit_position.
(generate_shared_structures): Convert size.
(encode_type, encode_complete_bitfield): Use integer_zerop.
(encode_bitfield): Use tree_low_cst and int_bit_position.
* ch/typeck.c (min_precision): New function.
(build_chill_slice): Use host_integerp and tree_low_cst.
(expand_constant_to_buffer): Likewise and also int_bit_position.
LO is unsigned HOST_WIDE_INT
(build_chill_array_ref_1): Make `i' be HOST_WIDE_INT; use tree_low_cst.
(extract_constant_from_buffer): Sizes are now HOST_WIDE_INT.
Use host_integerp and tree_low_cst.
(build_chill_bin_type): Use host_integerp and tree_low_cst.
(layout_chill_range_type): Use tree_int_cst_sgn, compare_tree_int,
tree_low_cst, and min_precision.
(apply_chill_array_layout): Cleanups for types of variables
and use tree_int_cst_sgn, compare_tree_int, and tree_low_cst.
(apply_chill_field_layout): Likewise.
* cp/class.c (build_vbase_path): Use integer_zerop.
(build_vtable_entry): Use tree_low_cst.
(get_vfield_offset): Use bit_position.
(dfs_modify_vtables): New variable vindex_val; `i' is HOST_WIDE_INT.
Use tree_low_cst.
(check_bitfield_decl): Set DECL_SIZE using convert.
(build_base_field): Set DECL_SIZE and DECL_SIZE_UNIT using size_binop.
(layout_virtual_bases): DSIZE is unsigned HOST_WIDE_INT.
Use tree_low_cst.
(finish_struct_1): Use bit_position.
(dump_class_hierarchy): Use tree_low_cst.
* cp/cp-tree.h (min_precision): Add declaration.
* cp/decl.c (xref_tag, xref_basetypes): Use tree_low_cst.
* cp/error.c (dump_type_suffix): Use host_integerp and tree_low_cst.
(dump_expr): Use integer_zerop, host_integerp, and tree_low_cst.
* cp/expr.c (cplus_expand_constant): Use bit_position.
* cp/init.c (build_vec_init): Use host_integerp and tree_low_cst.
* cp/rtti.c (get_base_offset): Use bit_position.
* cp/typeck.c (build_binary_op): Use integer_zerop, compare_tree_int,
host_integerp, and tree_low_cst.
(pointer_int_sum): Use integer_zerop.
(build_component_addr): Use bit_position.
* java/class.c (make_field_value): Properly handle sizes.
(get_dispatch_vector): Use tree_low_cst and host_integerp.
(layout_class_method): Count using trees.
* java/decl.c (push_promoted_type): Set TYPE_{MIN,MAX}_VALUE with
copy_node.
* java/expr.c (java_array_data_offset): Use int_bit_position.
(build_newarray, build_anewarray): Use host_integerp and tree_low_cst.
(build_invokevirtual): Use tree_low_cst and do computations with trees.
From-SVN: r32607
2000-03-17 18:31:58 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
If ALL is 1, we output space as necessary so that
|
|
|
|
|
|
we can output all the pending elements. */
|
1993-10-07 00:32:11 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
static void
|
|
|
|
|
|
output_pending_init_elements (int all)
|
|
|
|
|
|
{
|
|
|
|
|
|
struct init_node *elt = constructor_pending_elts;
|
|
|
|
|
|
tree next;
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
retry:
|
|
|
|
|
|
|
2003-12-13 05:11:23 +01:00
|
|
|
|
/* Look through the whole pending tree.
|
2003-07-18 02:26:51 +02:00
|
|
|
|
If we find an element that should be output now,
|
|
|
|
|
|
output it. Otherwise, set NEXT to the element
|
|
|
|
|
|
that comes first among those still pending. */
|
|
|
|
|
|
|
|
|
|
|
|
next = 0;
|
|
|
|
|
|
while (elt)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (TREE_CODE (constructor_type) == ARRAY_TYPE)
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (tree_int_cst_equal (elt->purpose,
|
|
|
|
|
|
constructor_unfilled_index))
|
2004-07-22 01:46:20 +02:00
|
|
|
|
output_init_element (elt->value, true,
|
2003-07-18 02:26:51 +02:00
|
|
|
|
TREE_TYPE (constructor_type),
|
|
|
|
|
|
constructor_unfilled_index, 0);
|
|
|
|
|
|
else if (tree_int_cst_lt (constructor_unfilled_index,
|
|
|
|
|
|
elt->purpose))
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Advance to the next smaller node. */
|
|
|
|
|
|
if (elt->left)
|
|
|
|
|
|
elt = elt->left;
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
/* We have reached the smallest node bigger than the
|
|
|
|
|
|
current unfilled index. Fill the space first. */
|
|
|
|
|
|
next = elt->purpose;
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
}
|
2001-01-31 18:38:11 +01:00
|
|
|
|
else
|
|
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Advance to the next bigger node. */
|
|
|
|
|
|
if (elt->right)
|
|
|
|
|
|
elt = elt->right;
|
|
|
|
|
|
else
|
2001-01-31 18:38:11 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* We have reached the biggest node in a subtree. Find
|
|
|
|
|
|
the parent of it, which is the next bigger node. */
|
|
|
|
|
|
while (elt->parent && elt->parent->right == elt)
|
|
|
|
|
|
elt = elt->parent;
|
|
|
|
|
|
elt = elt->parent;
|
|
|
|
|
|
if (elt && tree_int_cst_lt (constructor_unfilled_index,
|
|
|
|
|
|
elt->purpose))
|
|
|
|
|
|
{
|
|
|
|
|
|
next = elt->purpose;
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
2001-01-31 18:38:11 +01:00
|
|
|
|
}
|
|
|
|
|
|
}
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else if (TREE_CODE (constructor_type) == RECORD_TYPE
|
|
|
|
|
|
|| TREE_CODE (constructor_type) == UNION_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
tree ctor_unfilled_bitpos, elt_bitpos;
|
2001-01-31 18:38:11 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* If the current record is complete we are done. */
|
|
|
|
|
|
if (constructor_unfilled_fields == 0)
|
|
|
|
|
|
break;
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
ctor_unfilled_bitpos = bit_position (constructor_unfilled_fields);
|
|
|
|
|
|
elt_bitpos = bit_position (elt->purpose);
|
|
|
|
|
|
/* We can't compare fields here because there might be empty
|
|
|
|
|
|
fields in between. */
|
|
|
|
|
|
if (tree_int_cst_equal (elt_bitpos, ctor_unfilled_bitpos))
|
|
|
|
|
|
{
|
|
|
|
|
|
constructor_unfilled_fields = elt->purpose;
|
2004-07-22 01:46:20 +02:00
|
|
|
|
output_init_element (elt->value, true, TREE_TYPE (elt->purpose),
|
2003-07-18 02:26:51 +02:00
|
|
|
|
elt->purpose, 0);
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (tree_int_cst_lt (ctor_unfilled_bitpos, elt_bitpos))
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Advance to the next smaller node. */
|
|
|
|
|
|
if (elt->left)
|
|
|
|
|
|
elt = elt->left;
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
/* We have reached the smallest node bigger than the
|
|
|
|
|
|
current unfilled field. Fill the space first. */
|
|
|
|
|
|
next = elt->purpose;
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Advance to the next bigger node. */
|
|
|
|
|
|
if (elt->right)
|
|
|
|
|
|
elt = elt->right;
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
/* We have reached the biggest node in a subtree. Find
|
|
|
|
|
|
the parent of it, which is the next bigger node. */
|
|
|
|
|
|
while (elt->parent && elt->parent->right == elt)
|
|
|
|
|
|
elt = elt->parent;
|
|
|
|
|
|
elt = elt->parent;
|
|
|
|
|
|
if (elt
|
|
|
|
|
|
&& (tree_int_cst_lt (ctor_unfilled_bitpos,
|
|
|
|
|
|
bit_position (elt->purpose))))
|
|
|
|
|
|
{
|
|
|
|
|
|
next = elt->purpose;
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Ordinarily return, but not if we want to output all
|
|
|
|
|
|
and there are elements left. */
|
|
|
|
|
|
if (! (all && next != 0))
|
1995-08-26 01:26:36 +02:00
|
|
|
|
return;
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* If it's not incremental, just skip over the gap, so that after
|
|
|
|
|
|
jumping to retry we will output the next successive element. */
|
|
|
|
|
|
if (TREE_CODE (constructor_type) == RECORD_TYPE
|
|
|
|
|
|
|| TREE_CODE (constructor_type) == UNION_TYPE)
|
|
|
|
|
|
constructor_unfilled_fields = next;
|
|
|
|
|
|
else if (TREE_CODE (constructor_type) == ARRAY_TYPE)
|
|
|
|
|
|
constructor_unfilled_index = next;
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* ELT now points to the node in the pending tree with the next
|
|
|
|
|
|
initializer to output. */
|
|
|
|
|
|
goto retry;
|
1993-07-23 20:49:55 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Add one non-braced element to the current constructor level.
|
|
|
|
|
|
This adjusts the current position within the constructor's type.
|
|
|
|
|
|
This may also start or terminate implicit levels
|
|
|
|
|
|
to handle a partly-braced initializer.
|
1998-04-04 15:32:39 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
Once this has found the correct level for the new element,
|
|
|
|
|
|
it calls output_init_element. */
|
|
|
|
|
|
|
|
|
|
|
|
void
|
2004-07-22 01:46:20 +02:00
|
|
|
|
process_init_element (struct c_expr value)
|
1998-04-04 15:32:39 +02:00
|
|
|
|
{
|
2004-07-22 01:46:20 +02:00
|
|
|
|
tree orig_value = value.value;
|
|
|
|
|
|
int string_flag = orig_value != 0 && TREE_CODE (orig_value) == STRING_CST;
|
|
|
|
|
|
bool strict_string = value.original_code == STRING_CST;
|
1998-04-04 15:32:39 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
designator_depth = 0;
|
|
|
|
|
|
designator_errorneous = 0;
|
1998-04-04 15:32:39 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Handle superfluous braces around string cst as in
|
|
|
|
|
|
char x[] = {"foo"}; */
|
|
|
|
|
|
if (string_flag
|
|
|
|
|
|
&& constructor_type
|
|
|
|
|
|
&& TREE_CODE (constructor_type) == ARRAY_TYPE
|
2004-07-25 11:12:21 +02:00
|
|
|
|
&& INTEGRAL_TYPE_P (TREE_TYPE (constructor_type))
|
2003-07-18 02:26:51 +02:00
|
|
|
|
&& integer_zerop (constructor_unfilled_index))
|
1998-04-04 15:32:39 +02:00
|
|
|
|
{
|
2004-07-22 01:46:20 +02:00
|
|
|
|
if (constructor_stack->replacement_value.value)
|
2003-07-18 02:26:51 +02:00
|
|
|
|
error_init ("excess elements in char array initializer");
|
|
|
|
|
|
constructor_stack->replacement_value = value;
|
|
|
|
|
|
return;
|
1998-04-04 15:32:39 +02:00
|
|
|
|
}
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
|
2004-07-22 01:46:20 +02:00
|
|
|
|
if (constructor_stack->replacement_value.value != 0)
|
2003-07-18 02:26:51 +02:00
|
|
|
|
{
|
|
|
|
|
|
error_init ("excess elements in struct initializer");
|
|
|
|
|
|
return;
|
1998-04-04 15:32:39 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Ignore elements of a brace group if it is entirely superfluous
|
|
|
|
|
|
and has already been diagnosed. */
|
|
|
|
|
|
if (constructor_type == 0)
|
|
|
|
|
|
return;
|
1998-04-04 15:32:39 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* If we've exhausted any levels that didn't have braces,
|
|
|
|
|
|
pop them now. */
|
|
|
|
|
|
while (constructor_stack->implicit)
|
|
|
|
|
|
{
|
|
|
|
|
|
if ((TREE_CODE (constructor_type) == RECORD_TYPE
|
|
|
|
|
|
|| TREE_CODE (constructor_type) == UNION_TYPE)
|
|
|
|
|
|
&& constructor_fields == 0)
|
|
|
|
|
|
process_init_element (pop_init_level (1));
|
|
|
|
|
|
else if (TREE_CODE (constructor_type) == ARRAY_TYPE
|
|
|
|
|
|
&& (constructor_max_index == 0
|
|
|
|
|
|
|| tree_int_cst_lt (constructor_max_index,
|
|
|
|
|
|
constructor_index)))
|
|
|
|
|
|
process_init_element (pop_init_level (1));
|
|
|
|
|
|
else
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
1998-04-04 15:32:39 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* In the case of [LO ... HI] = VALUE, only evaluate VALUE once. */
|
|
|
|
|
|
if (constructor_range_stack)
|
1998-04-04 15:32:39 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* If value is a compound literal and we'll be just using its
|
|
|
|
|
|
content, don't put it into a SAVE_EXPR. */
|
2004-07-22 01:46:20 +02:00
|
|
|
|
if (TREE_CODE (value.value) != COMPOUND_LITERAL_EXPR
|
2003-07-18 02:26:51 +02:00
|
|
|
|
|| !require_constant_value
|
|
|
|
|
|
|| flag_isoc99)
|
2004-07-22 01:46:20 +02:00
|
|
|
|
value.value = save_expr (value.value);
|
2003-07-18 02:26:51 +02:00
|
|
|
|
}
|
1998-04-04 15:32:39 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
while (1)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (TREE_CODE (constructor_type) == RECORD_TYPE)
|
1998-04-04 15:32:39 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
tree fieldtype;
|
|
|
|
|
|
enum tree_code fieldcode;
|
1998-04-04 15:32:39 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (constructor_fields == 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
pedwarn_init ("excess elements in struct initializer");
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
1998-04-04 15:32:39 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
fieldtype = TREE_TYPE (constructor_fields);
|
|
|
|
|
|
if (fieldtype != error_mark_node)
|
|
|
|
|
|
fieldtype = TYPE_MAIN_VARIANT (fieldtype);
|
|
|
|
|
|
fieldcode = TREE_CODE (fieldtype);
|
1998-04-04 15:32:39 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Error for non-static initialization of a flexible array member. */
|
|
|
|
|
|
if (fieldcode == ARRAY_TYPE
|
|
|
|
|
|
&& !require_constant_value
|
|
|
|
|
|
&& TYPE_SIZE (fieldtype) == NULL_TREE
|
|
|
|
|
|
&& TREE_CHAIN (constructor_fields) == NULL_TREE)
|
|
|
|
|
|
{
|
|
|
|
|
|
error_init ("non-static initialization of a flexible array member");
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
1998-04-04 15:32:39 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Accept a string constant to initialize a subarray. */
|
2004-07-22 01:46:20 +02:00
|
|
|
|
if (value.value != 0
|
2003-07-18 02:26:51 +02:00
|
|
|
|
&& fieldcode == ARRAY_TYPE
|
2004-07-25 11:12:21 +02:00
|
|
|
|
&& INTEGRAL_TYPE_P (TREE_TYPE (fieldtype))
|
2003-07-18 02:26:51 +02:00
|
|
|
|
&& string_flag)
|
2004-07-22 01:46:20 +02:00
|
|
|
|
value.value = orig_value;
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Otherwise, if we have come to a subaggregate,
|
|
|
|
|
|
and we don't have an element of its type, push into it. */
|
2004-07-22 01:46:20 +02:00
|
|
|
|
else if (value.value != 0 && !constructor_no_implicit
|
|
|
|
|
|
&& value.value != error_mark_node
|
|
|
|
|
|
&& TYPE_MAIN_VARIANT (TREE_TYPE (value.value)) != fieldtype
|
2003-07-18 02:26:51 +02:00
|
|
|
|
&& (fieldcode == RECORD_TYPE || fieldcode == ARRAY_TYPE
|
|
|
|
|
|
|| fieldcode == UNION_TYPE))
|
|
|
|
|
|
{
|
|
|
|
|
|
push_init_level (1);
|
|
|
|
|
|
continue;
|
|
|
|
|
|
}
|
1998-04-04 15:32:39 +02:00
|
|
|
|
|
2004-07-22 01:46:20 +02:00
|
|
|
|
if (value.value)
|
2003-07-18 02:26:51 +02:00
|
|
|
|
{
|
|
|
|
|
|
push_member_name (constructor_fields);
|
2004-07-22 01:46:20 +02:00
|
|
|
|
output_init_element (value.value, strict_string,
|
|
|
|
|
|
fieldtype, constructor_fields, 1);
|
2003-07-18 02:26:51 +02:00
|
|
|
|
RESTORE_SPELLING_DEPTH (constructor_depth);
|
1998-04-04 15:32:39 +02:00
|
|
|
|
}
|
|
|
|
|
|
else
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Do the bookkeeping for an element that was
|
|
|
|
|
|
directly output as a constructor. */
|
1998-04-04 15:32:39 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* For a record, keep track of end position of last field. */
|
|
|
|
|
|
if (DECL_SIZE (constructor_fields))
|
|
|
|
|
|
constructor_bit_index
|
|
|
|
|
|
= size_binop (PLUS_EXPR,
|
|
|
|
|
|
bit_position (constructor_fields),
|
|
|
|
|
|
DECL_SIZE (constructor_fields));
|
|
|
|
|
|
|
|
|
|
|
|
/* If the current field was the first one not yet written out,
|
|
|
|
|
|
it isn't now, so update. */
|
|
|
|
|
|
if (constructor_unfilled_fields == constructor_fields)
|
|
|
|
|
|
{
|
|
|
|
|
|
constructor_unfilled_fields = TREE_CHAIN (constructor_fields);
|
|
|
|
|
|
/* Skip any nameless bit fields. */
|
|
|
|
|
|
while (constructor_unfilled_fields != 0
|
|
|
|
|
|
&& DECL_C_BIT_FIELD (constructor_unfilled_fields)
|
|
|
|
|
|
&& DECL_NAME (constructor_unfilled_fields) == 0)
|
|
|
|
|
|
constructor_unfilled_fields =
|
|
|
|
|
|
TREE_CHAIN (constructor_unfilled_fields);
|
|
|
|
|
|
}
|
1998-04-04 15:32:39 +02:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
|
|
|
|
|
|
constructor_fields = TREE_CHAIN (constructor_fields);
|
|
|
|
|
|
/* Skip any nameless bit fields at the beginning. */
|
|
|
|
|
|
while (constructor_fields != 0
|
|
|
|
|
|
&& DECL_C_BIT_FIELD (constructor_fields)
|
|
|
|
|
|
&& DECL_NAME (constructor_fields) == 0)
|
|
|
|
|
|
constructor_fields = TREE_CHAIN (constructor_fields);
|
1998-04-04 15:32:39 +02:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else if (TREE_CODE (constructor_type) == UNION_TYPE)
|
1998-04-04 15:32:39 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
tree fieldtype;
|
|
|
|
|
|
enum tree_code fieldcode;
|
1998-04-04 15:32:39 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (constructor_fields == 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
pedwarn_init ("excess elements in union initializer");
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
1998-04-04 15:32:39 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
fieldtype = TREE_TYPE (constructor_fields);
|
|
|
|
|
|
if (fieldtype != error_mark_node)
|
|
|
|
|
|
fieldtype = TYPE_MAIN_VARIANT (fieldtype);
|
|
|
|
|
|
fieldcode = TREE_CODE (fieldtype);
|
1998-04-04 15:32:39 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Warn that traditional C rejects initialization of unions.
|
|
|
|
|
|
We skip the warning if the value is zero. This is done
|
|
|
|
|
|
under the assumption that the zero initializer in user
|
|
|
|
|
|
code appears conditioned on e.g. __STDC__ to avoid
|
|
|
|
|
|
"missing initializer" warnings and relies on default
|
|
|
|
|
|
initialization to zero in the traditional C case.
|
|
|
|
|
|
We also skip the warning if the initializer is designated,
|
|
|
|
|
|
again on the assumption that this must be conditional on
|
|
|
|
|
|
__STDC__ anyway (and we've already complained about the
|
|
|
|
|
|
member-designator already). */
|
|
|
|
|
|
if (warn_traditional && !in_system_header && !constructor_designated
|
2004-07-22 01:46:20 +02:00
|
|
|
|
&& !(value.value && (integer_zerop (value.value)
|
|
|
|
|
|
|| real_zerop (value.value))))
|
2003-07-18 02:26:51 +02:00
|
|
|
|
warning ("traditional C rejects initialization of unions");
|
1998-04-04 15:32:39 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Accept a string constant to initialize a subarray. */
|
2004-07-22 01:46:20 +02:00
|
|
|
|
if (value.value != 0
|
2003-07-18 02:26:51 +02:00
|
|
|
|
&& fieldcode == ARRAY_TYPE
|
2004-07-25 11:12:21 +02:00
|
|
|
|
&& INTEGRAL_TYPE_P (TREE_TYPE (fieldtype))
|
2003-07-18 02:26:51 +02:00
|
|
|
|
&& string_flag)
|
2004-07-22 01:46:20 +02:00
|
|
|
|
value.value = orig_value;
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Otherwise, if we have come to a subaggregate,
|
|
|
|
|
|
and we don't have an element of its type, push into it. */
|
2004-07-22 01:46:20 +02:00
|
|
|
|
else if (value.value != 0 && !constructor_no_implicit
|
|
|
|
|
|
&& value.value != error_mark_node
|
|
|
|
|
|
&& TYPE_MAIN_VARIANT (TREE_TYPE (value.value)) != fieldtype
|
2003-07-18 02:26:51 +02:00
|
|
|
|
&& (fieldcode == RECORD_TYPE || fieldcode == ARRAY_TYPE
|
|
|
|
|
|
|| fieldcode == UNION_TYPE))
|
|
|
|
|
|
{
|
|
|
|
|
|
push_init_level (1);
|
|
|
|
|
|
continue;
|
|
|
|
|
|
}
|
1998-04-04 15:32:39 +02:00
|
|
|
|
|
2004-07-22 01:46:20 +02:00
|
|
|
|
if (value.value)
|
2003-07-18 02:26:51 +02:00
|
|
|
|
{
|
|
|
|
|
|
push_member_name (constructor_fields);
|
2004-07-22 01:46:20 +02:00
|
|
|
|
output_init_element (value.value, strict_string,
|
|
|
|
|
|
fieldtype, constructor_fields, 1);
|
2003-07-18 02:26:51 +02:00
|
|
|
|
RESTORE_SPELLING_DEPTH (constructor_depth);
|
1998-04-04 15:32:39 +02:00
|
|
|
|
}
|
|
|
|
|
|
else
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Do the bookkeeping for an element that was
|
|
|
|
|
|
directly output as a constructor. */
|
1998-04-04 15:32:39 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
constructor_bit_index = DECL_SIZE (constructor_fields);
|
|
|
|
|
|
constructor_unfilled_fields = TREE_CHAIN (constructor_fields);
|
1998-04-04 15:32:39 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
constructor_fields = 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (TREE_CODE (constructor_type) == ARRAY_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
tree elttype = TYPE_MAIN_VARIANT (TREE_TYPE (constructor_type));
|
|
|
|
|
|
enum tree_code eltcode = TREE_CODE (elttype);
|
1998-04-04 15:32:39 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Accept a string constant to initialize a subarray. */
|
2004-07-22 01:46:20 +02:00
|
|
|
|
if (value.value != 0
|
2003-07-18 02:26:51 +02:00
|
|
|
|
&& eltcode == ARRAY_TYPE
|
2004-07-25 11:12:21 +02:00
|
|
|
|
&& INTEGRAL_TYPE_P (TREE_TYPE (elttype))
|
2003-07-18 02:26:51 +02:00
|
|
|
|
&& string_flag)
|
2004-07-22 01:46:20 +02:00
|
|
|
|
value.value = orig_value;
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Otherwise, if we have come to a subaggregate,
|
|
|
|
|
|
and we don't have an element of its type, push into it. */
|
2004-07-22 01:46:20 +02:00
|
|
|
|
else if (value.value != 0 && !constructor_no_implicit
|
|
|
|
|
|
&& value.value != error_mark_node
|
|
|
|
|
|
&& TYPE_MAIN_VARIANT (TREE_TYPE (value.value)) != elttype
|
2003-07-18 02:26:51 +02:00
|
|
|
|
&& (eltcode == RECORD_TYPE || eltcode == ARRAY_TYPE
|
|
|
|
|
|
|| eltcode == UNION_TYPE))
|
|
|
|
|
|
{
|
|
|
|
|
|
push_init_level (1);
|
|
|
|
|
|
continue;
|
|
|
|
|
|
}
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (constructor_max_index != 0
|
|
|
|
|
|
&& (tree_int_cst_lt (constructor_max_index, constructor_index)
|
|
|
|
|
|
|| integer_all_onesp (constructor_max_index)))
|
|
|
|
|
|
{
|
|
|
|
|
|
pedwarn_init ("excess elements in array initializer");
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Now output the actual element. */
|
2004-07-22 01:46:20 +02:00
|
|
|
|
if (value.value)
|
2003-07-18 02:26:51 +02:00
|
|
|
|
{
|
|
|
|
|
|
push_array_bounds (tree_low_cst (constructor_index, 0));
|
2004-07-22 01:46:20 +02:00
|
|
|
|
output_init_element (value.value, strict_string,
|
|
|
|
|
|
elttype, constructor_index, 1);
|
2003-07-18 02:26:51 +02:00
|
|
|
|
RESTORE_SPELLING_DEPTH (constructor_depth);
|
|
|
|
|
|
}
|
2003-06-22 15:41:26 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
constructor_index
|
|
|
|
|
|
= size_binop (PLUS_EXPR, constructor_index, bitsize_one_node);
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
|
2004-07-22 01:46:20 +02:00
|
|
|
|
if (!value.value)
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* If we are doing the bookkeeping for an element that was
|
|
|
|
|
|
directly output as a constructor, we must update
|
|
|
|
|
|
constructor_unfilled_index. */
|
|
|
|
|
|
constructor_unfilled_index = constructor_index;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (TREE_CODE (constructor_type) == VECTOR_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
tree elttype = TYPE_MAIN_VARIANT (TREE_TYPE (constructor_type));
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Do a basic check of initializer size. Note that vectors
|
|
|
|
|
|
always have a fixed size derived from their type. */
|
|
|
|
|
|
if (tree_int_cst_lt (constructor_max_index, constructor_index))
|
|
|
|
|
|
{
|
|
|
|
|
|
pedwarn_init ("excess elements in vector initializer");
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Now output the actual element. */
|
2004-07-22 01:46:20 +02:00
|
|
|
|
if (value.value)
|
|
|
|
|
|
output_init_element (value.value, strict_string,
|
|
|
|
|
|
elttype, constructor_index, 1);
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
constructor_index
|
|
|
|
|
|
= size_binop (PLUS_EXPR, constructor_index, bitsize_one_node);
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
|
2004-07-22 01:46:20 +02:00
|
|
|
|
if (!value.value)
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* If we are doing the bookkeeping for an element that was
|
|
|
|
|
|
directly output as a constructor, we must update
|
|
|
|
|
|
constructor_unfilled_index. */
|
|
|
|
|
|
constructor_unfilled_index = constructor_index;
|
|
|
|
|
|
}
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Handle the sole element allowed in a braced initializer
|
|
|
|
|
|
for a scalar variable. */
|
|
|
|
|
|
else if (constructor_fields == 0)
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
pedwarn_init ("excess elements in scalar initializer");
|
|
|
|
|
|
break;
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
2004-07-22 01:46:20 +02:00
|
|
|
|
if (value.value)
|
|
|
|
|
|
output_init_element (value.value, strict_string,
|
|
|
|
|
|
constructor_type, NULL_TREE, 1);
|
2003-07-18 02:26:51 +02:00
|
|
|
|
constructor_fields = 0;
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Handle range initializers either at this level or anywhere higher
|
|
|
|
|
|
in the designator stack. */
|
|
|
|
|
|
if (constructor_range_stack)
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
struct constructor_range_stack *p, *range_stack;
|
|
|
|
|
|
int finish = 0;
|
|
|
|
|
|
|
|
|
|
|
|
range_stack = constructor_range_stack;
|
|
|
|
|
|
constructor_range_stack = 0;
|
|
|
|
|
|
while (constructor_stack != range_stack->stack)
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (!constructor_stack->implicit)
|
|
|
|
|
|
abort ();
|
|
|
|
|
|
process_init_element (pop_init_level (1));
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
for (p = range_stack;
|
|
|
|
|
|
!p->range_end || tree_int_cst_equal (p->index, p->range_end);
|
|
|
|
|
|
p = p->prev)
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (!constructor_stack->implicit)
|
|
|
|
|
|
abort ();
|
|
|
|
|
|
process_init_element (pop_init_level (1));
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
|
|
|
|
|
|
p->index = size_binop (PLUS_EXPR, p->index, bitsize_one_node);
|
|
|
|
|
|
if (tree_int_cst_equal (p->index, p->range_end) && !p->prev)
|
|
|
|
|
|
finish = 1;
|
|
|
|
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
|
|
{
|
|
|
|
|
|
constructor_index = p->index;
|
|
|
|
|
|
constructor_fields = p->fields;
|
|
|
|
|
|
if (finish && p->range_end && p->index == p->range_start)
|
|
|
|
|
|
{
|
|
|
|
|
|
finish = 0;
|
|
|
|
|
|
p->prev = 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
p = p->next;
|
|
|
|
|
|
if (!p)
|
|
|
|
|
|
break;
|
|
|
|
|
|
push_init_level (2);
|
|
|
|
|
|
p->stack = constructor_stack;
|
|
|
|
|
|
if (p->range_end && tree_int_cst_equal (p->index, p->range_end))
|
|
|
|
|
|
p->index = p->range_start;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (!finish)
|
|
|
|
|
|
constructor_range_stack = range_stack;
|
|
|
|
|
|
continue;
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
break;
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
constructor_range_stack = 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2004-02-12 20:14:05 +01:00
|
|
|
|
/* Build a complete asm-statement, whose components are a CV_QUALIFIER
|
|
|
|
|
|
(guaranteed to be 'volatile' or null) and ARGS (represented using
|
2004-06-16 22:23:02 +02:00
|
|
|
|
an ASM_EXPR node). */
|
2003-07-18 02:26:51 +02:00
|
|
|
|
tree
|
2004-02-12 20:14:05 +01:00
|
|
|
|
build_asm_stmt (tree cv_qualifier, tree args)
|
2003-07-18 02:26:51 +02:00
|
|
|
|
{
|
2004-05-13 08:41:07 +02:00
|
|
|
|
if (!ASM_VOLATILE_P (args) && cv_qualifier)
|
|
|
|
|
|
ASM_VOLATILE_P (args) = 1;
|
2004-02-12 20:14:05 +01:00
|
|
|
|
return add_stmt (args);
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
2004-02-12 20:14:05 +01:00
|
|
|
|
/* Build an asm-expr, whose components are a STRING, some OUTPUTS,
|
|
|
|
|
|
some INPUTS, and some CLOBBERS. The latter three may be NULL.
|
|
|
|
|
|
SIMPLE indicates whether there was anything at all after the
|
|
|
|
|
|
string in the asm expression -- asm("blah") and asm("blah" : )
|
2004-06-16 22:23:02 +02:00
|
|
|
|
are subtly different. We use a ASM_EXPR node to represent this. */
|
2003-07-18 02:26:51 +02:00
|
|
|
|
tree
|
2004-02-12 20:14:05 +01:00
|
|
|
|
build_asm_expr (tree string, tree outputs, tree inputs, tree clobbers,
|
|
|
|
|
|
bool simple)
|
1998-04-04 15:32:39 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
tree tail;
|
2004-02-12 20:14:05 +01:00
|
|
|
|
tree args;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
int i;
|
|
|
|
|
|
const char *constraint;
|
|
|
|
|
|
bool allows_mem, allows_reg, is_inout;
|
|
|
|
|
|
int ninputs;
|
|
|
|
|
|
int noutputs;
|
|
|
|
|
|
|
|
|
|
|
|
ninputs = list_length (inputs);
|
|
|
|
|
|
noutputs = list_length (outputs);
|
2003-07-18 02:26:51 +02:00
|
|
|
|
|
2004-05-13 08:41:07 +02:00
|
|
|
|
/* Remove output conversions that change the type but not the mode. */
|
|
|
|
|
|
for (i = 0, tail = outputs; tail; ++i, tail = TREE_CHAIN (tail))
|
1998-04-04 15:32:39 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
tree output = TREE_VALUE (tail);
|
|
|
|
|
|
STRIP_NOPS (output);
|
|
|
|
|
|
TREE_VALUE (tail) = output;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
lvalue_or_else (output, "invalid lvalue in asm statement");
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
|
2004-05-13 08:41:07 +02:00
|
|
|
|
constraint = TREE_STRING_POINTER (TREE_VALUE (TREE_PURPOSE (tail)));
|
2003-07-18 02:26:51 +02:00
|
|
|
|
|
2004-05-13 08:41:07 +02:00
|
|
|
|
if (!parse_output_constraint (&constraint, i, ninputs, noutputs,
|
|
|
|
|
|
&allows_mem, &allows_reg, &is_inout))
|
|
|
|
|
|
{
|
|
|
|
|
|
/* By marking this operand as erroneous, we will not try
|
|
|
|
|
|
to process this operand again in expand_asm_operands. */
|
|
|
|
|
|
TREE_VALUE (tail) = error_mark_node;
|
|
|
|
|
|
continue;
|
|
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
|
2004-05-13 08:41:07 +02:00
|
|
|
|
/* If the operand is a DECL that is going to end up in
|
|
|
|
|
|
memory, assume it is addressable. This is a bit more
|
|
|
|
|
|
conservative than it would ideally be; the exact test is
|
|
|
|
|
|
buried deep in expand_asm_operands and depends on the
|
|
|
|
|
|
DECL_RTL for the OPERAND -- which we don't have at this
|
|
|
|
|
|
point. */
|
|
|
|
|
|
if (!allows_reg && DECL_P (output))
|
|
|
|
|
|
c_mark_addressable (output);
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
|
|
|
|
|
|
/* Perform default conversions on array and function inputs.
|
|
|
|
|
|
Don't do this for other types as it would screw up operands
|
|
|
|
|
|
expected to be in memory. */
|
|
|
|
|
|
for (tail = inputs; tail; tail = TREE_CHAIN (tail))
|
|
|
|
|
|
TREE_VALUE (tail) = default_function_array_conversion (TREE_VALUE (tail));
|
|
|
|
|
|
|
2004-06-16 22:23:02 +02:00
|
|
|
|
args = build_stmt (ASM_EXPR, string, outputs, inputs, clobbers);
|
2004-02-12 20:14:05 +01:00
|
|
|
|
|
|
|
|
|
|
/* Simple asm statements are treated as volatile. */
|
|
|
|
|
|
if (simple)
|
|
|
|
|
|
{
|
2004-05-13 08:41:07 +02:00
|
|
|
|
ASM_VOLATILE_P (args) = 1;
|
2004-02-12 20:14:05 +01:00
|
|
|
|
ASM_INPUT_P (args) = 1;
|
|
|
|
|
|
}
|
|
|
|
|
|
return args;
|
1998-04-04 15:32:39 +02:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
/* Generate a goto statement to LABEL. */
|
|
|
|
|
|
|
|
|
|
|
|
tree
|
|
|
|
|
|
c_finish_goto_label (tree label)
|
|
|
|
|
|
{
|
|
|
|
|
|
tree decl = lookup_label (label);
|
|
|
|
|
|
if (!decl)
|
|
|
|
|
|
return NULL_TREE;
|
|
|
|
|
|
|
|
|
|
|
|
TREE_USED (decl) = 1;
|
|
|
|
|
|
return add_stmt (build (GOTO_EXPR, void_type_node, decl));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Generate a computed goto statement to EXPR. */
|
|
|
|
|
|
|
|
|
|
|
|
tree
|
|
|
|
|
|
c_finish_goto_ptr (tree expr)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (pedantic)
|
|
|
|
|
|
pedwarn ("ISO C forbids `goto *expr;'");
|
|
|
|
|
|
expr = convert (ptr_type_node, expr);
|
|
|
|
|
|
return add_stmt (build (GOTO_EXPR, void_type_node, expr));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2004-06-22 01:30:30 +02:00
|
|
|
|
/* Generate a C `return' statement. RETVAL is the expression for what
|
|
|
|
|
|
to return, or a null pointer for `return;' with no value. */
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
tree
|
2004-06-22 01:30:30 +02:00
|
|
|
|
c_finish_return (tree retval)
|
2003-07-18 02:26:51 +02:00
|
|
|
|
{
|
|
|
|
|
|
tree valtype = TREE_TYPE (TREE_TYPE (current_function_decl));
|
|
|
|
|
|
|
|
|
|
|
|
if (TREE_THIS_VOLATILE (current_function_decl))
|
|
|
|
|
|
warning ("function declared `noreturn' has a `return' statement");
|
|
|
|
|
|
|
|
|
|
|
|
if (!retval)
|
1993-07-23 20:49:55 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
current_function_returns_null = 1;
|
|
|
|
|
|
if ((warn_return_type || flag_isoc99)
|
|
|
|
|
|
&& valtype != 0 && TREE_CODE (valtype) != VOID_TYPE)
|
|
|
|
|
|
pedwarn_c99 ("`return' with no value, in function returning non-void");
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else if (valtype == 0 || TREE_CODE (valtype) == VOID_TYPE)
|
1993-07-23 20:49:55 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
current_function_returns_null = 1;
|
|
|
|
|
|
if (pedantic || TREE_CODE (TREE_TYPE (retval)) != VOID_TYPE)
|
|
|
|
|
|
pedwarn ("`return' with a value, in function returning void");
|
1993-07-23 20:49:55 +02:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else
|
1993-07-23 20:49:55 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
tree t = convert_for_assignment (valtype, retval, _("return"),
|
|
|
|
|
|
NULL_TREE, NULL_TREE, 0);
|
|
|
|
|
|
tree res = DECL_RESULT (current_function_decl);
|
|
|
|
|
|
tree inner;
|
|
|
|
|
|
|
|
|
|
|
|
current_function_returns_value = 1;
|
|
|
|
|
|
if (t == error_mark_node)
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
return NULL_TREE;
|
2003-07-18 02:26:51 +02:00
|
|
|
|
|
|
|
|
|
|
inner = t = convert (TREE_TYPE (res), t);
|
|
|
|
|
|
|
|
|
|
|
|
/* Strip any conversions, additions, and subtractions, and see if
|
|
|
|
|
|
we are returning the address of a local variable. Warn if so. */
|
|
|
|
|
|
while (1)
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
switch (TREE_CODE (inner))
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
case NOP_EXPR: case NON_LVALUE_EXPR: case CONVERT_EXPR:
|
|
|
|
|
|
case PLUS_EXPR:
|
|
|
|
|
|
inner = TREE_OPERAND (inner, 0);
|
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
|
|
case MINUS_EXPR:
|
|
|
|
|
|
/* If the second operand of the MINUS_EXPR has a pointer
|
|
|
|
|
|
type (or is converted from it), this may be valid, so
|
|
|
|
|
|
don't give a warning. */
|
|
|
|
|
|
{
|
|
|
|
|
|
tree op1 = TREE_OPERAND (inner, 1);
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
while (! POINTER_TYPE_P (TREE_TYPE (op1))
|
|
|
|
|
|
&& (TREE_CODE (op1) == NOP_EXPR
|
|
|
|
|
|
|| TREE_CODE (op1) == NON_LVALUE_EXPR
|
|
|
|
|
|
|| TREE_CODE (op1) == CONVERT_EXPR))
|
|
|
|
|
|
op1 = TREE_OPERAND (op1, 0);
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (POINTER_TYPE_P (TREE_TYPE (op1)))
|
|
|
|
|
|
break;
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
inner = TREE_OPERAND (inner, 0);
|
|
|
|
|
|
continue;
|
|
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
case ADDR_EXPR:
|
|
|
|
|
|
inner = TREE_OPERAND (inner, 0);
|
1992-10-18 09:12:53 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
while (TREE_CODE_CLASS (TREE_CODE (inner)) == 'r')
|
|
|
|
|
|
inner = TREE_OPERAND (inner, 0);
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
|
2004-02-23 16:22:04 +01:00
|
|
|
|
if (DECL_P (inner)
|
2003-07-18 02:26:51 +02:00
|
|
|
|
&& ! DECL_EXTERNAL (inner)
|
|
|
|
|
|
&& ! TREE_STATIC (inner)
|
|
|
|
|
|
&& DECL_CONTEXT (inner) == current_function_decl)
|
|
|
|
|
|
warning ("function returns address of local variable");
|
|
|
|
|
|
break;
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
default:
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
retval = build (MODIFY_EXPR, TREE_TYPE (res), res, t);
|
1993-07-23 20:49:55 +02:00
|
|
|
|
}
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
return add_stmt (build_stmt (RETURN_EXPR, retval));
|
1993-07-23 20:49:55 +02:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
|
|
|
|
|
|
struct c_switch {
|
|
|
|
|
|
/* The SWITCH_STMT being built. */
|
|
|
|
|
|
tree switch_stmt;
|
2004-07-20 11:57:13 +02:00
|
|
|
|
|
|
|
|
|
|
/* The original type of the testing expression, ie. before the
|
|
|
|
|
|
default conversion is applied. */
|
|
|
|
|
|
tree orig_type;
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* A splay-tree mapping the low element of a case range to the high
|
|
|
|
|
|
element, or NULL_TREE if there is no high element. Used to
|
|
|
|
|
|
determine whether or not a new case label duplicates an old case
|
|
|
|
|
|
label. We need a tree, rather than simply a hash table, because
|
|
|
|
|
|
of the GNU case range extension. */
|
|
|
|
|
|
splay_tree cases;
|
2004-07-20 11:57:13 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* The next node on the stack. */
|
|
|
|
|
|
struct c_switch *next;
|
|
|
|
|
|
};
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* A stack of the currently active switch statements. The innermost
|
|
|
|
|
|
switch statement is on the top of the stack. There is no need to
|
|
|
|
|
|
mark the stack for garbage collection because it is only active
|
|
|
|
|
|
during the processing of the body of a function, and we never
|
|
|
|
|
|
collect at that point. */
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
struct c_switch *c_switch_stack;
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Start a C switch statement, testing expression EXP. Return the new
|
|
|
|
|
|
SWITCH_STMT. */
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
tree
|
|
|
|
|
|
c_start_case (tree exp)
|
1993-07-23 20:49:55 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
enum tree_code code;
|
|
|
|
|
|
tree type, orig_type = error_mark_node;
|
|
|
|
|
|
struct c_switch *cs;
|
2003-06-22 15:41:26 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (exp != error_mark_node)
|
1993-07-23 20:49:55 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
code = TREE_CODE (TREE_TYPE (exp));
|
|
|
|
|
|
orig_type = TREE_TYPE (exp);
|
|
|
|
|
|
|
|
|
|
|
|
if (! INTEGRAL_TYPE_P (orig_type)
|
|
|
|
|
|
&& code != ERROR_MARK)
|
1993-07-23 20:49:55 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
error ("switch quantity not an integer");
|
|
|
|
|
|
exp = integer_zero_node;
|
1993-07-23 20:49:55 +02:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else
|
1993-07-23 20:49:55 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
type = TYPE_MAIN_VARIANT (TREE_TYPE (exp));
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (warn_traditional && !in_system_header
|
|
|
|
|
|
&& (type == long_integer_type_node
|
|
|
|
|
|
|| type == long_unsigned_type_node))
|
|
|
|
|
|
warning ("`long' switch expression not converted to `int' in ISO C");
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
exp = default_conversion (exp);
|
|
|
|
|
|
type = TREE_TYPE (exp);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Add this new SWITCH_STMT to the stack. */
|
2003-07-19 16:47:15 +02:00
|
|
|
|
cs = xmalloc (sizeof (*cs));
|
2003-07-18 02:26:51 +02:00
|
|
|
|
cs->switch_stmt = build_stmt (SWITCH_STMT, exp, NULL_TREE, orig_type);
|
2004-07-20 11:57:13 +02:00
|
|
|
|
cs->orig_type = orig_type;
|
2003-07-18 02:26:51 +02:00
|
|
|
|
cs->cases = splay_tree_new (case_compare, NULL, NULL);
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
cs->next = c_switch_stack;
|
|
|
|
|
|
c_switch_stack = cs;
|
2003-07-18 02:26:51 +02:00
|
|
|
|
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
return add_stmt (cs->switch_stmt);
|
2003-07-18 02:26:51 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Process a case label. */
|
|
|
|
|
|
|
|
|
|
|
|
tree
|
|
|
|
|
|
do_case (tree low_value, tree high_value)
|
|
|
|
|
|
{
|
|
|
|
|
|
tree label = NULL_TREE;
|
|
|
|
|
|
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
if (c_switch_stack)
|
2003-07-18 02:26:51 +02:00
|
|
|
|
{
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
label = c_add_case_label (c_switch_stack->cases,
|
|
|
|
|
|
SWITCH_COND (c_switch_stack->switch_stmt),
|
2004-07-20 11:57:13 +02:00
|
|
|
|
c_switch_stack->orig_type,
|
2003-07-18 02:26:51 +02:00
|
|
|
|
low_value, high_value);
|
|
|
|
|
|
if (label == error_mark_node)
|
|
|
|
|
|
label = NULL_TREE;
|
1993-07-23 20:49:55 +02:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else if (low_value)
|
|
|
|
|
|
error ("case label not within a switch statement");
|
|
|
|
|
|
else
|
|
|
|
|
|
error ("`default' label not within a switch statement");
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
return label;
|
|
|
|
|
|
}
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Finish the switch statement. */
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
void
|
c-common.c (lang_gimplify_stmt): Remove next_p argument.
* c-common.c (lang_gimplify_stmt): Remove next_p argument.
(if_elt, if_stack, if_stack_space, c_expand_start_cond, c_finish_then,
c_expand_end_cond, c_expand_start_else, c_finish_else, c_begin_if_stmt,
c_begin_while_stmt, c_finish_while_stmt_cond): Move to c-typeck.c.
(finish_fname_decls, fname_decl): Use statement_lists.
(c_expand_expr_stmt): Don't set last_expr_type.
(c_type_hash): Fix indentation.
(c_safe_from_p): Don't follow TREE_CHAIN.
(c_tree_chain_matters_p): Remove.
* c-common.def (SCOPE_STMT): Remove.
(CLEANUP_STMT): Redefine to contain its own body.
* c-common.h (struct stmt_tree_s): Remove x_last_stmt,
x_last_expr_type, x_last_expr_filename, x_scope_stmt_stack.
Add x_cur_stmt_list.
(last_tree, last_expr_type, last_expr_filename, RECHAIN_STMTS): Remove.
(cur_stmt_list): New.
(STATEMENT_LIST_STMT_EXPR): New.
(SCOPE_BEGIN_P, SCOPE_END_P, SCOPE_STMT_BLOCK, SCOPE_NULLIFIED_P,
SCOPE_NO_CLEANUPS_P, SCOPE_PARTIAL_P, NEW_FOR_SCOPE_P): Remove.
(CLEANUP_BODY): New.
(CLEANUP_DECL): Move to operand 2.
(c_common_stmt_codes): Remove SCOPE_STMT.
(COMPOUND_STMT_NO_SCOPE, COMPOUND_STMT_BODY_BLOCK): Remove.
* c-decl.c (c_scope_stmt_stack, current_scope_stmt_stack): Remove.
(c_push_function_context, c_pop_function_context): Don't save it.
(finish_decl): Set TREE_USED on the decl for a cleanup.
Use push_cleanup.
(store_parm_decls): Use statement lists.
(finish_function): Remove compstmt rule workaround. Use statement
lists. Call finish_fname_decls after finalizing the body.
(c_begin_compound_stmt): Move to c-typeck.c.
* c-dump.c (c_dump_tree): Remove SCOPE_STMT.
* c-gimplify.c (gimplify_cleanup_stmt, gimplify_cleanup_stmts): New.
(c_genericize): Invoke them.
(c_gimplify_stmt): Don't look through TREE_CHAIN. Kill SCOPE_STMT.
(c_build_bind_expr): Export.
(gimplify_block, gimplify_cleanup): Remove.
(gimplify_condition): Use gimplify_stmt.
(gimplify_for_stmt): Remove FOR_INIT_STMT chaining hack.
(gimplify_if_stmt): Remove recursion hack.
(c_gimplify_expr): Remove STMT_EXPR handling.
(stmt_expr_last_stmt, gimplify_stmt_expr): Remove.
(is_last_stmt_of_scope): Remove.
* c-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
* c-mudflap.c (mflang_flush_calls): Use c_begin_compound_stmt,
c_end_compound_stmt.
* c-objc-common.c (build_cdtor): Likewise.
* c-parse.in (primary): Use c_finish_stmt_expr.
(push_scope, pop_scope): Remove.
(c99_block_start, compstmt_start): Use c_begin_compound_stmt.
(c99_block_end, compstmt): Use c_end_compound_stmt.
(c99_block_lineno_labeled_stmt): Likewise.
(compstmt_primary_start): Use c_begin_stmt_expr.
(simple_if, select_or_iter_stmt): Update calls to stmt builders.
(do_stmt_start): Fill in body directly.
(lineno_stmt): Avoid setting lineno on constants.
* c-pretty-print.c (pp_c_statement): Handle STATEMENT_LIST.
Remove SCOPE_STMT.
* c-semantics.c (begin_stmt_tree): Remove.
(push_stmt_list, re_push_stmt_list, pop_stmt_list): New.
(add_stmt): Use statement lists.
(add_scope_stmt, finish_stmt_tree): Remove.
(push_cleanup): New.
* c-tree.h: Move some decls from c-common.h.
* c-typeck.c (c_tree_expr_nonnegative_p): Simplify for statement lists.
(do_case, c_finish_case): Likewise.
(c_finish_then): Take body for then as argument.
(c_finish_else): Similarly.
(c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): New.
(c_begin_stmt_expr, c_finish_stmt_expr): New.
(c_begin_compound_stmt): Do scope management.
(c_end_compound_stmt): New.
* fold-const.c (tree_expr_nonnegative_p): Fix BIND_EXPR.
* gimplify.c (voidify_wrapper_expr): Accept temporary argument.
Look through exception handling constructs.
(gimplify_bind_expr): Accept temporary argument.
(gimplify_target_expr): Special case BIND_EXPR bodies.
(gimplify_expr): Handle fallback == fb_none like a statement.
* langhooks-def.h (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Kill.
* langhooks.c (lhd_tree_inlining_tree_chain_matters_p): Remove.
* langhooks.h (tree_chain_matters_p): Remove.
* stub-objc.c (objc_clear_super_receiver): New.
* tree-gimple.h (voidify_wrapper_expr): Update decl.
(append_to_statement_list, append_to_statement_list_force): Move
to tree-iterator.h.
* tree-inline.c (expand_call_inline): Update call.
(clone_body): Use statement lists.
(walk_tree): Don't check tree_chain_matters_p.
(copy_tree_r): Likewise.
* tree-iterator.c (alloc_stmt_list): Clear lang bits.
(tsi_link_before, tsi_link_after): Set TREE_SIDE_EFFECTS properly.
* tree-iterator.h (append_to_statement_list,
append_to_statement_list_force): Moved from tree-gimple.h.
* tree-pretty-print.c (dump_generic_node): Clean up TARGET_EXPR dump.
* objc/objc-act.c (build_module_descriptor): Use c_begin_compound_stmt.
(objc_enter_block): Likewise.
(objc_exit_block): Use c_end_compound_stmt.
(objc_build_try_enter_fragment): Add #error and comment for
rewriting for OBJCPLUS.
(objc_build_extract_fragment, objc_build_try_epilogue,
objc_build_catch_stmt, objc_build_finally_prologue,
objc_build_finally_epilogue): Update for C statement builders.
* objc/objc-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P):
Remove.
cp/
* call.c (initialize_reference): Don't build CLEANUP_STMT here.
* cp-gimplify.c (cp_gimplify_stmt): Remove next_p argument.
(genericize_try_block): Use gimplify_stmt.
(genericize_catch_block, genericize_eh_spec_block): Likewise.
(cp_gimplify_init_expr): Remove STMT_EXPR special case.
(gimplify_must_not_throw_expr): Update voidify_wrapper_expr call.
* cp-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
(cp_tree_chain_matters_p): Remove.
* cp-tree.h (COMPOUND_STMT_TRY_BLOCK): New.
(COMPOUND_STMT_BODY_BLOCK): New.
(STATEMENT_LIST_NO_SCOPE, STATEMENT_LIST_TRY_BLOCK): New.
(EXPR_STMT_STMT_EXPR_RESULT): New.
(building_stmt_tree): Check cur_stmt_list.
(tf_stmt_expr_cmpd, tf_stmt_expr_body): Remove.
(BCS_NO_SCOPE, BCS_TRY_BLOCK, BCS_FN_BODY): New.
* decl.c (poplevel): Use pop_stmt_list for minding cleanups.
(cp_finish_decl): Use push_cleanup.
(start_function, finish_function): Use statement lists.
(finish_stmt): Do nothing.
* except.c (begin_eh_spec_block): Use statement lists.
(check_handlers_1, check_handlers): Likewise.
* init.c (construct_virtual_base): Don't add extra compound stmts.
(build_vec_init): Likewise.
* name-lookup.c (maybe_push_cleanup_level): Use statement lists.
* name-lookup.h (struct cp_binding_level): Add statement_list.
* parser.c (cp_parser_statement): Take the STMT_EXPR node, not a bool.
(cp_parser_labeled_statement, cp_parser_expression_statement,
cp_parser_statement_seq_opt): Likewise.
(cp_parser_compound_statement): Likewise. Take bool for try block.
(cp_parser_selection_statement): Tidy if processing.
(cp_parser_already_scoped_statement): Rewrite to do what it says.
* pt.c (tsubst_copy): Move STMT_EXPR to tsubst_expr.
(tsubst_expr): Rewrite STMT_EXPR processing. Handle STATEMENT_LIST.
Mind COMPOUND_STMT_TRY_BLOCK, EXPR_STMT_STMT_EXPR_RESULT.
* semantics.c (do_poplevel, do_pushlevel): Use statement lists.
(finish_cond): New, rewritten from FINISH_COND.
(simplify_loop_decl_cond): New.
(finish_expr_stmt): Avoid nested EXPR_STMTs.
(begin_if_stmt, finish_if_stmt_cond, finish_then_clause,
begin_else_clause, finish_else_clause, finish_if_stmt,
begin_while_stmt, finish_while_stmt_cond, finish_while_stmt,
begin_do_stmt, finish_do_body, begin_for_stmt, finish_for_init_stmt,
finish_for_cond, finish_for_stmt, begin_switch_stmt,
finish_switch_cond, finish_switch_stmt, begin_try_block,
finish_try_block, finish_cleanup_try_block, finish_function_try_block,
finish_handler_sequence, finish_function_handler_sequence,
begin_handler, finish_handler_parms, finish_handler,
begin_stmt_expr, finish_stmt_expr_expr, finish_stmt_expr): Rewrite
using statement lists.
(begin_compound_stmt): Replace has_no_scope argument with flags.
Update all callers. Use statement lists.
(finish_compound_stmt): Likewise.
(finish_decl_cleanup, finish_eh_cleanup): Use push_cleanup.
(current_scope_stmt_stack): Remove.
(simplify_aggr_init_expr): Don't muck with TREE_CHAIN.
* typeck2.c (split_nonconstant_init_1, split_nonconstant_init):
Rewrite with statement lists.
testsuite/
* g++.dg/ext/stmtexpr1.C: XFAIL.
* gcc.dg/20030612-1.c: XFAIL.
From-SVN: r83221
2004-06-16 03:21:38 +02:00
|
|
|
|
c_finish_case (tree body)
|
2003-07-18 02:26:51 +02:00
|
|
|
|
{
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
struct c_switch *cs = c_switch_stack;
|
2003-07-18 02:26:51 +02:00
|
|
|
|
|
c-common.c (lang_gimplify_stmt): Remove next_p argument.
* c-common.c (lang_gimplify_stmt): Remove next_p argument.
(if_elt, if_stack, if_stack_space, c_expand_start_cond, c_finish_then,
c_expand_end_cond, c_expand_start_else, c_finish_else, c_begin_if_stmt,
c_begin_while_stmt, c_finish_while_stmt_cond): Move to c-typeck.c.
(finish_fname_decls, fname_decl): Use statement_lists.
(c_expand_expr_stmt): Don't set last_expr_type.
(c_type_hash): Fix indentation.
(c_safe_from_p): Don't follow TREE_CHAIN.
(c_tree_chain_matters_p): Remove.
* c-common.def (SCOPE_STMT): Remove.
(CLEANUP_STMT): Redefine to contain its own body.
* c-common.h (struct stmt_tree_s): Remove x_last_stmt,
x_last_expr_type, x_last_expr_filename, x_scope_stmt_stack.
Add x_cur_stmt_list.
(last_tree, last_expr_type, last_expr_filename, RECHAIN_STMTS): Remove.
(cur_stmt_list): New.
(STATEMENT_LIST_STMT_EXPR): New.
(SCOPE_BEGIN_P, SCOPE_END_P, SCOPE_STMT_BLOCK, SCOPE_NULLIFIED_P,
SCOPE_NO_CLEANUPS_P, SCOPE_PARTIAL_P, NEW_FOR_SCOPE_P): Remove.
(CLEANUP_BODY): New.
(CLEANUP_DECL): Move to operand 2.
(c_common_stmt_codes): Remove SCOPE_STMT.
(COMPOUND_STMT_NO_SCOPE, COMPOUND_STMT_BODY_BLOCK): Remove.
* c-decl.c (c_scope_stmt_stack, current_scope_stmt_stack): Remove.
(c_push_function_context, c_pop_function_context): Don't save it.
(finish_decl): Set TREE_USED on the decl for a cleanup.
Use push_cleanup.
(store_parm_decls): Use statement lists.
(finish_function): Remove compstmt rule workaround. Use statement
lists. Call finish_fname_decls after finalizing the body.
(c_begin_compound_stmt): Move to c-typeck.c.
* c-dump.c (c_dump_tree): Remove SCOPE_STMT.
* c-gimplify.c (gimplify_cleanup_stmt, gimplify_cleanup_stmts): New.
(c_genericize): Invoke them.
(c_gimplify_stmt): Don't look through TREE_CHAIN. Kill SCOPE_STMT.
(c_build_bind_expr): Export.
(gimplify_block, gimplify_cleanup): Remove.
(gimplify_condition): Use gimplify_stmt.
(gimplify_for_stmt): Remove FOR_INIT_STMT chaining hack.
(gimplify_if_stmt): Remove recursion hack.
(c_gimplify_expr): Remove STMT_EXPR handling.
(stmt_expr_last_stmt, gimplify_stmt_expr): Remove.
(is_last_stmt_of_scope): Remove.
* c-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
* c-mudflap.c (mflang_flush_calls): Use c_begin_compound_stmt,
c_end_compound_stmt.
* c-objc-common.c (build_cdtor): Likewise.
* c-parse.in (primary): Use c_finish_stmt_expr.
(push_scope, pop_scope): Remove.
(c99_block_start, compstmt_start): Use c_begin_compound_stmt.
(c99_block_end, compstmt): Use c_end_compound_stmt.
(c99_block_lineno_labeled_stmt): Likewise.
(compstmt_primary_start): Use c_begin_stmt_expr.
(simple_if, select_or_iter_stmt): Update calls to stmt builders.
(do_stmt_start): Fill in body directly.
(lineno_stmt): Avoid setting lineno on constants.
* c-pretty-print.c (pp_c_statement): Handle STATEMENT_LIST.
Remove SCOPE_STMT.
* c-semantics.c (begin_stmt_tree): Remove.
(push_stmt_list, re_push_stmt_list, pop_stmt_list): New.
(add_stmt): Use statement lists.
(add_scope_stmt, finish_stmt_tree): Remove.
(push_cleanup): New.
* c-tree.h: Move some decls from c-common.h.
* c-typeck.c (c_tree_expr_nonnegative_p): Simplify for statement lists.
(do_case, c_finish_case): Likewise.
(c_finish_then): Take body for then as argument.
(c_finish_else): Similarly.
(c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): New.
(c_begin_stmt_expr, c_finish_stmt_expr): New.
(c_begin_compound_stmt): Do scope management.
(c_end_compound_stmt): New.
* fold-const.c (tree_expr_nonnegative_p): Fix BIND_EXPR.
* gimplify.c (voidify_wrapper_expr): Accept temporary argument.
Look through exception handling constructs.
(gimplify_bind_expr): Accept temporary argument.
(gimplify_target_expr): Special case BIND_EXPR bodies.
(gimplify_expr): Handle fallback == fb_none like a statement.
* langhooks-def.h (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Kill.
* langhooks.c (lhd_tree_inlining_tree_chain_matters_p): Remove.
* langhooks.h (tree_chain_matters_p): Remove.
* stub-objc.c (objc_clear_super_receiver): New.
* tree-gimple.h (voidify_wrapper_expr): Update decl.
(append_to_statement_list, append_to_statement_list_force): Move
to tree-iterator.h.
* tree-inline.c (expand_call_inline): Update call.
(clone_body): Use statement lists.
(walk_tree): Don't check tree_chain_matters_p.
(copy_tree_r): Likewise.
* tree-iterator.c (alloc_stmt_list): Clear lang bits.
(tsi_link_before, tsi_link_after): Set TREE_SIDE_EFFECTS properly.
* tree-iterator.h (append_to_statement_list,
append_to_statement_list_force): Moved from tree-gimple.h.
* tree-pretty-print.c (dump_generic_node): Clean up TARGET_EXPR dump.
* objc/objc-act.c (build_module_descriptor): Use c_begin_compound_stmt.
(objc_enter_block): Likewise.
(objc_exit_block): Use c_end_compound_stmt.
(objc_build_try_enter_fragment): Add #error and comment for
rewriting for OBJCPLUS.
(objc_build_extract_fragment, objc_build_try_epilogue,
objc_build_catch_stmt, objc_build_finally_prologue,
objc_build_finally_epilogue): Update for C statement builders.
* objc/objc-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P):
Remove.
cp/
* call.c (initialize_reference): Don't build CLEANUP_STMT here.
* cp-gimplify.c (cp_gimplify_stmt): Remove next_p argument.
(genericize_try_block): Use gimplify_stmt.
(genericize_catch_block, genericize_eh_spec_block): Likewise.
(cp_gimplify_init_expr): Remove STMT_EXPR special case.
(gimplify_must_not_throw_expr): Update voidify_wrapper_expr call.
* cp-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
(cp_tree_chain_matters_p): Remove.
* cp-tree.h (COMPOUND_STMT_TRY_BLOCK): New.
(COMPOUND_STMT_BODY_BLOCK): New.
(STATEMENT_LIST_NO_SCOPE, STATEMENT_LIST_TRY_BLOCK): New.
(EXPR_STMT_STMT_EXPR_RESULT): New.
(building_stmt_tree): Check cur_stmt_list.
(tf_stmt_expr_cmpd, tf_stmt_expr_body): Remove.
(BCS_NO_SCOPE, BCS_TRY_BLOCK, BCS_FN_BODY): New.
* decl.c (poplevel): Use pop_stmt_list for minding cleanups.
(cp_finish_decl): Use push_cleanup.
(start_function, finish_function): Use statement lists.
(finish_stmt): Do nothing.
* except.c (begin_eh_spec_block): Use statement lists.
(check_handlers_1, check_handlers): Likewise.
* init.c (construct_virtual_base): Don't add extra compound stmts.
(build_vec_init): Likewise.
* name-lookup.c (maybe_push_cleanup_level): Use statement lists.
* name-lookup.h (struct cp_binding_level): Add statement_list.
* parser.c (cp_parser_statement): Take the STMT_EXPR node, not a bool.
(cp_parser_labeled_statement, cp_parser_expression_statement,
cp_parser_statement_seq_opt): Likewise.
(cp_parser_compound_statement): Likewise. Take bool for try block.
(cp_parser_selection_statement): Tidy if processing.
(cp_parser_already_scoped_statement): Rewrite to do what it says.
* pt.c (tsubst_copy): Move STMT_EXPR to tsubst_expr.
(tsubst_expr): Rewrite STMT_EXPR processing. Handle STATEMENT_LIST.
Mind COMPOUND_STMT_TRY_BLOCK, EXPR_STMT_STMT_EXPR_RESULT.
* semantics.c (do_poplevel, do_pushlevel): Use statement lists.
(finish_cond): New, rewritten from FINISH_COND.
(simplify_loop_decl_cond): New.
(finish_expr_stmt): Avoid nested EXPR_STMTs.
(begin_if_stmt, finish_if_stmt_cond, finish_then_clause,
begin_else_clause, finish_else_clause, finish_if_stmt,
begin_while_stmt, finish_while_stmt_cond, finish_while_stmt,
begin_do_stmt, finish_do_body, begin_for_stmt, finish_for_init_stmt,
finish_for_cond, finish_for_stmt, begin_switch_stmt,
finish_switch_cond, finish_switch_stmt, begin_try_block,
finish_try_block, finish_cleanup_try_block, finish_function_try_block,
finish_handler_sequence, finish_function_handler_sequence,
begin_handler, finish_handler_parms, finish_handler,
begin_stmt_expr, finish_stmt_expr_expr, finish_stmt_expr): Rewrite
using statement lists.
(begin_compound_stmt): Replace has_no_scope argument with flags.
Update all callers. Use statement lists.
(finish_compound_stmt): Likewise.
(finish_decl_cleanup, finish_eh_cleanup): Use push_cleanup.
(current_scope_stmt_stack): Remove.
(simplify_aggr_init_expr): Don't muck with TREE_CHAIN.
* typeck2.c (split_nonconstant_init_1, split_nonconstant_init):
Rewrite with statement lists.
testsuite/
* g++.dg/ext/stmtexpr1.C: XFAIL.
* gcc.dg/20030612-1.c: XFAIL.
From-SVN: r83221
2004-06-16 03:21:38 +02:00
|
|
|
|
SWITCH_BODY (cs->switch_stmt) = body;
|
|
|
|
|
|
|
2004-05-13 08:41:07 +02:00
|
|
|
|
/* Emit warnings as needed. */
|
|
|
|
|
|
c_do_switch_warnings (cs->cases, cs->switch_stmt);
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Pop the stack. */
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
c_switch_stack = cs->next;
|
2003-07-18 02:26:51 +02:00
|
|
|
|
splay_tree_delete (cs->cases);
|
|
|
|
|
|
free (cs);
|
1993-07-23 20:49:55 +02:00
|
|
|
|
}
|
c-common.c (lang_gimplify_stmt): Remove next_p argument.
* c-common.c (lang_gimplify_stmt): Remove next_p argument.
(if_elt, if_stack, if_stack_space, c_expand_start_cond, c_finish_then,
c_expand_end_cond, c_expand_start_else, c_finish_else, c_begin_if_stmt,
c_begin_while_stmt, c_finish_while_stmt_cond): Move to c-typeck.c.
(finish_fname_decls, fname_decl): Use statement_lists.
(c_expand_expr_stmt): Don't set last_expr_type.
(c_type_hash): Fix indentation.
(c_safe_from_p): Don't follow TREE_CHAIN.
(c_tree_chain_matters_p): Remove.
* c-common.def (SCOPE_STMT): Remove.
(CLEANUP_STMT): Redefine to contain its own body.
* c-common.h (struct stmt_tree_s): Remove x_last_stmt,
x_last_expr_type, x_last_expr_filename, x_scope_stmt_stack.
Add x_cur_stmt_list.
(last_tree, last_expr_type, last_expr_filename, RECHAIN_STMTS): Remove.
(cur_stmt_list): New.
(STATEMENT_LIST_STMT_EXPR): New.
(SCOPE_BEGIN_P, SCOPE_END_P, SCOPE_STMT_BLOCK, SCOPE_NULLIFIED_P,
SCOPE_NO_CLEANUPS_P, SCOPE_PARTIAL_P, NEW_FOR_SCOPE_P): Remove.
(CLEANUP_BODY): New.
(CLEANUP_DECL): Move to operand 2.
(c_common_stmt_codes): Remove SCOPE_STMT.
(COMPOUND_STMT_NO_SCOPE, COMPOUND_STMT_BODY_BLOCK): Remove.
* c-decl.c (c_scope_stmt_stack, current_scope_stmt_stack): Remove.
(c_push_function_context, c_pop_function_context): Don't save it.
(finish_decl): Set TREE_USED on the decl for a cleanup.
Use push_cleanup.
(store_parm_decls): Use statement lists.
(finish_function): Remove compstmt rule workaround. Use statement
lists. Call finish_fname_decls after finalizing the body.
(c_begin_compound_stmt): Move to c-typeck.c.
* c-dump.c (c_dump_tree): Remove SCOPE_STMT.
* c-gimplify.c (gimplify_cleanup_stmt, gimplify_cleanup_stmts): New.
(c_genericize): Invoke them.
(c_gimplify_stmt): Don't look through TREE_CHAIN. Kill SCOPE_STMT.
(c_build_bind_expr): Export.
(gimplify_block, gimplify_cleanup): Remove.
(gimplify_condition): Use gimplify_stmt.
(gimplify_for_stmt): Remove FOR_INIT_STMT chaining hack.
(gimplify_if_stmt): Remove recursion hack.
(c_gimplify_expr): Remove STMT_EXPR handling.
(stmt_expr_last_stmt, gimplify_stmt_expr): Remove.
(is_last_stmt_of_scope): Remove.
* c-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
* c-mudflap.c (mflang_flush_calls): Use c_begin_compound_stmt,
c_end_compound_stmt.
* c-objc-common.c (build_cdtor): Likewise.
* c-parse.in (primary): Use c_finish_stmt_expr.
(push_scope, pop_scope): Remove.
(c99_block_start, compstmt_start): Use c_begin_compound_stmt.
(c99_block_end, compstmt): Use c_end_compound_stmt.
(c99_block_lineno_labeled_stmt): Likewise.
(compstmt_primary_start): Use c_begin_stmt_expr.
(simple_if, select_or_iter_stmt): Update calls to stmt builders.
(do_stmt_start): Fill in body directly.
(lineno_stmt): Avoid setting lineno on constants.
* c-pretty-print.c (pp_c_statement): Handle STATEMENT_LIST.
Remove SCOPE_STMT.
* c-semantics.c (begin_stmt_tree): Remove.
(push_stmt_list, re_push_stmt_list, pop_stmt_list): New.
(add_stmt): Use statement lists.
(add_scope_stmt, finish_stmt_tree): Remove.
(push_cleanup): New.
* c-tree.h: Move some decls from c-common.h.
* c-typeck.c (c_tree_expr_nonnegative_p): Simplify for statement lists.
(do_case, c_finish_case): Likewise.
(c_finish_then): Take body for then as argument.
(c_finish_else): Similarly.
(c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): New.
(c_begin_stmt_expr, c_finish_stmt_expr): New.
(c_begin_compound_stmt): Do scope management.
(c_end_compound_stmt): New.
* fold-const.c (tree_expr_nonnegative_p): Fix BIND_EXPR.
* gimplify.c (voidify_wrapper_expr): Accept temporary argument.
Look through exception handling constructs.
(gimplify_bind_expr): Accept temporary argument.
(gimplify_target_expr): Special case BIND_EXPR bodies.
(gimplify_expr): Handle fallback == fb_none like a statement.
* langhooks-def.h (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Kill.
* langhooks.c (lhd_tree_inlining_tree_chain_matters_p): Remove.
* langhooks.h (tree_chain_matters_p): Remove.
* stub-objc.c (objc_clear_super_receiver): New.
* tree-gimple.h (voidify_wrapper_expr): Update decl.
(append_to_statement_list, append_to_statement_list_force): Move
to tree-iterator.h.
* tree-inline.c (expand_call_inline): Update call.
(clone_body): Use statement lists.
(walk_tree): Don't check tree_chain_matters_p.
(copy_tree_r): Likewise.
* tree-iterator.c (alloc_stmt_list): Clear lang bits.
(tsi_link_before, tsi_link_after): Set TREE_SIDE_EFFECTS properly.
* tree-iterator.h (append_to_statement_list,
append_to_statement_list_force): Moved from tree-gimple.h.
* tree-pretty-print.c (dump_generic_node): Clean up TARGET_EXPR dump.
* objc/objc-act.c (build_module_descriptor): Use c_begin_compound_stmt.
(objc_enter_block): Likewise.
(objc_exit_block): Use c_end_compound_stmt.
(objc_build_try_enter_fragment): Add #error and comment for
rewriting for OBJCPLUS.
(objc_build_extract_fragment, objc_build_try_epilogue,
objc_build_catch_stmt, objc_build_finally_prologue,
objc_build_finally_epilogue): Update for C statement builders.
* objc/objc-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P):
Remove.
cp/
* call.c (initialize_reference): Don't build CLEANUP_STMT here.
* cp-gimplify.c (cp_gimplify_stmt): Remove next_p argument.
(genericize_try_block): Use gimplify_stmt.
(genericize_catch_block, genericize_eh_spec_block): Likewise.
(cp_gimplify_init_expr): Remove STMT_EXPR special case.
(gimplify_must_not_throw_expr): Update voidify_wrapper_expr call.
* cp-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
(cp_tree_chain_matters_p): Remove.
* cp-tree.h (COMPOUND_STMT_TRY_BLOCK): New.
(COMPOUND_STMT_BODY_BLOCK): New.
(STATEMENT_LIST_NO_SCOPE, STATEMENT_LIST_TRY_BLOCK): New.
(EXPR_STMT_STMT_EXPR_RESULT): New.
(building_stmt_tree): Check cur_stmt_list.
(tf_stmt_expr_cmpd, tf_stmt_expr_body): Remove.
(BCS_NO_SCOPE, BCS_TRY_BLOCK, BCS_FN_BODY): New.
* decl.c (poplevel): Use pop_stmt_list for minding cleanups.
(cp_finish_decl): Use push_cleanup.
(start_function, finish_function): Use statement lists.
(finish_stmt): Do nothing.
* except.c (begin_eh_spec_block): Use statement lists.
(check_handlers_1, check_handlers): Likewise.
* init.c (construct_virtual_base): Don't add extra compound stmts.
(build_vec_init): Likewise.
* name-lookup.c (maybe_push_cleanup_level): Use statement lists.
* name-lookup.h (struct cp_binding_level): Add statement_list.
* parser.c (cp_parser_statement): Take the STMT_EXPR node, not a bool.
(cp_parser_labeled_statement, cp_parser_expression_statement,
cp_parser_statement_seq_opt): Likewise.
(cp_parser_compound_statement): Likewise. Take bool for try block.
(cp_parser_selection_statement): Tidy if processing.
(cp_parser_already_scoped_statement): Rewrite to do what it says.
* pt.c (tsubst_copy): Move STMT_EXPR to tsubst_expr.
(tsubst_expr): Rewrite STMT_EXPR processing. Handle STATEMENT_LIST.
Mind COMPOUND_STMT_TRY_BLOCK, EXPR_STMT_STMT_EXPR_RESULT.
* semantics.c (do_poplevel, do_pushlevel): Use statement lists.
(finish_cond): New, rewritten from FINISH_COND.
(simplify_loop_decl_cond): New.
(finish_expr_stmt): Avoid nested EXPR_STMTs.
(begin_if_stmt, finish_if_stmt_cond, finish_then_clause,
begin_else_clause, finish_else_clause, finish_if_stmt,
begin_while_stmt, finish_while_stmt_cond, finish_while_stmt,
begin_do_stmt, finish_do_body, begin_for_stmt, finish_for_init_stmt,
finish_for_cond, finish_for_stmt, begin_switch_stmt,
finish_switch_cond, finish_switch_stmt, begin_try_block,
finish_try_block, finish_cleanup_try_block, finish_function_try_block,
finish_handler_sequence, finish_function_handler_sequence,
begin_handler, finish_handler_parms, finish_handler,
begin_stmt_expr, finish_stmt_expr_expr, finish_stmt_expr): Rewrite
using statement lists.
(begin_compound_stmt): Replace has_no_scope argument with flags.
Update all callers. Use statement lists.
(finish_compound_stmt): Likewise.
(finish_decl_cleanup, finish_eh_cleanup): Use push_cleanup.
(current_scope_stmt_stack): Remove.
(simplify_aggr_init_expr): Don't muck with TREE_CHAIN.
* typeck2.c (split_nonconstant_init_1, split_nonconstant_init):
Rewrite with statement lists.
testsuite/
* g++.dg/ext/stmtexpr1.C: XFAIL.
* gcc.dg/20030612-1.c: XFAIL.
From-SVN: r83221
2004-06-16 03:21:38 +02:00
|
|
|
|
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
/* Emit an if statement. IF_LOCUS is the location of the 'if'. COND,
|
|
|
|
|
|
THEN_BLOCK and ELSE_BLOCK are expressions to be used; ELSE_BLOCK
|
|
|
|
|
|
may be null. NESTED_IF is true if THEN_BLOCK contains another IF
|
|
|
|
|
|
statement, and was not surrounded with parenthesis. */
|
c-common.c (lang_gimplify_stmt): Remove next_p argument.
* c-common.c (lang_gimplify_stmt): Remove next_p argument.
(if_elt, if_stack, if_stack_space, c_expand_start_cond, c_finish_then,
c_expand_end_cond, c_expand_start_else, c_finish_else, c_begin_if_stmt,
c_begin_while_stmt, c_finish_while_stmt_cond): Move to c-typeck.c.
(finish_fname_decls, fname_decl): Use statement_lists.
(c_expand_expr_stmt): Don't set last_expr_type.
(c_type_hash): Fix indentation.
(c_safe_from_p): Don't follow TREE_CHAIN.
(c_tree_chain_matters_p): Remove.
* c-common.def (SCOPE_STMT): Remove.
(CLEANUP_STMT): Redefine to contain its own body.
* c-common.h (struct stmt_tree_s): Remove x_last_stmt,
x_last_expr_type, x_last_expr_filename, x_scope_stmt_stack.
Add x_cur_stmt_list.
(last_tree, last_expr_type, last_expr_filename, RECHAIN_STMTS): Remove.
(cur_stmt_list): New.
(STATEMENT_LIST_STMT_EXPR): New.
(SCOPE_BEGIN_P, SCOPE_END_P, SCOPE_STMT_BLOCK, SCOPE_NULLIFIED_P,
SCOPE_NO_CLEANUPS_P, SCOPE_PARTIAL_P, NEW_FOR_SCOPE_P): Remove.
(CLEANUP_BODY): New.
(CLEANUP_DECL): Move to operand 2.
(c_common_stmt_codes): Remove SCOPE_STMT.
(COMPOUND_STMT_NO_SCOPE, COMPOUND_STMT_BODY_BLOCK): Remove.
* c-decl.c (c_scope_stmt_stack, current_scope_stmt_stack): Remove.
(c_push_function_context, c_pop_function_context): Don't save it.
(finish_decl): Set TREE_USED on the decl for a cleanup.
Use push_cleanup.
(store_parm_decls): Use statement lists.
(finish_function): Remove compstmt rule workaround. Use statement
lists. Call finish_fname_decls after finalizing the body.
(c_begin_compound_stmt): Move to c-typeck.c.
* c-dump.c (c_dump_tree): Remove SCOPE_STMT.
* c-gimplify.c (gimplify_cleanup_stmt, gimplify_cleanup_stmts): New.
(c_genericize): Invoke them.
(c_gimplify_stmt): Don't look through TREE_CHAIN. Kill SCOPE_STMT.
(c_build_bind_expr): Export.
(gimplify_block, gimplify_cleanup): Remove.
(gimplify_condition): Use gimplify_stmt.
(gimplify_for_stmt): Remove FOR_INIT_STMT chaining hack.
(gimplify_if_stmt): Remove recursion hack.
(c_gimplify_expr): Remove STMT_EXPR handling.
(stmt_expr_last_stmt, gimplify_stmt_expr): Remove.
(is_last_stmt_of_scope): Remove.
* c-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
* c-mudflap.c (mflang_flush_calls): Use c_begin_compound_stmt,
c_end_compound_stmt.
* c-objc-common.c (build_cdtor): Likewise.
* c-parse.in (primary): Use c_finish_stmt_expr.
(push_scope, pop_scope): Remove.
(c99_block_start, compstmt_start): Use c_begin_compound_stmt.
(c99_block_end, compstmt): Use c_end_compound_stmt.
(c99_block_lineno_labeled_stmt): Likewise.
(compstmt_primary_start): Use c_begin_stmt_expr.
(simple_if, select_or_iter_stmt): Update calls to stmt builders.
(do_stmt_start): Fill in body directly.
(lineno_stmt): Avoid setting lineno on constants.
* c-pretty-print.c (pp_c_statement): Handle STATEMENT_LIST.
Remove SCOPE_STMT.
* c-semantics.c (begin_stmt_tree): Remove.
(push_stmt_list, re_push_stmt_list, pop_stmt_list): New.
(add_stmt): Use statement lists.
(add_scope_stmt, finish_stmt_tree): Remove.
(push_cleanup): New.
* c-tree.h: Move some decls from c-common.h.
* c-typeck.c (c_tree_expr_nonnegative_p): Simplify for statement lists.
(do_case, c_finish_case): Likewise.
(c_finish_then): Take body for then as argument.
(c_finish_else): Similarly.
(c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): New.
(c_begin_stmt_expr, c_finish_stmt_expr): New.
(c_begin_compound_stmt): Do scope management.
(c_end_compound_stmt): New.
* fold-const.c (tree_expr_nonnegative_p): Fix BIND_EXPR.
* gimplify.c (voidify_wrapper_expr): Accept temporary argument.
Look through exception handling constructs.
(gimplify_bind_expr): Accept temporary argument.
(gimplify_target_expr): Special case BIND_EXPR bodies.
(gimplify_expr): Handle fallback == fb_none like a statement.
* langhooks-def.h (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Kill.
* langhooks.c (lhd_tree_inlining_tree_chain_matters_p): Remove.
* langhooks.h (tree_chain_matters_p): Remove.
* stub-objc.c (objc_clear_super_receiver): New.
* tree-gimple.h (voidify_wrapper_expr): Update decl.
(append_to_statement_list, append_to_statement_list_force): Move
to tree-iterator.h.
* tree-inline.c (expand_call_inline): Update call.
(clone_body): Use statement lists.
(walk_tree): Don't check tree_chain_matters_p.
(copy_tree_r): Likewise.
* tree-iterator.c (alloc_stmt_list): Clear lang bits.
(tsi_link_before, tsi_link_after): Set TREE_SIDE_EFFECTS properly.
* tree-iterator.h (append_to_statement_list,
append_to_statement_list_force): Moved from tree-gimple.h.
* tree-pretty-print.c (dump_generic_node): Clean up TARGET_EXPR dump.
* objc/objc-act.c (build_module_descriptor): Use c_begin_compound_stmt.
(objc_enter_block): Likewise.
(objc_exit_block): Use c_end_compound_stmt.
(objc_build_try_enter_fragment): Add #error and comment for
rewriting for OBJCPLUS.
(objc_build_extract_fragment, objc_build_try_epilogue,
objc_build_catch_stmt, objc_build_finally_prologue,
objc_build_finally_epilogue): Update for C statement builders.
* objc/objc-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P):
Remove.
cp/
* call.c (initialize_reference): Don't build CLEANUP_STMT here.
* cp-gimplify.c (cp_gimplify_stmt): Remove next_p argument.
(genericize_try_block): Use gimplify_stmt.
(genericize_catch_block, genericize_eh_spec_block): Likewise.
(cp_gimplify_init_expr): Remove STMT_EXPR special case.
(gimplify_must_not_throw_expr): Update voidify_wrapper_expr call.
* cp-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
(cp_tree_chain_matters_p): Remove.
* cp-tree.h (COMPOUND_STMT_TRY_BLOCK): New.
(COMPOUND_STMT_BODY_BLOCK): New.
(STATEMENT_LIST_NO_SCOPE, STATEMENT_LIST_TRY_BLOCK): New.
(EXPR_STMT_STMT_EXPR_RESULT): New.
(building_stmt_tree): Check cur_stmt_list.
(tf_stmt_expr_cmpd, tf_stmt_expr_body): Remove.
(BCS_NO_SCOPE, BCS_TRY_BLOCK, BCS_FN_BODY): New.
* decl.c (poplevel): Use pop_stmt_list for minding cleanups.
(cp_finish_decl): Use push_cleanup.
(start_function, finish_function): Use statement lists.
(finish_stmt): Do nothing.
* except.c (begin_eh_spec_block): Use statement lists.
(check_handlers_1, check_handlers): Likewise.
* init.c (construct_virtual_base): Don't add extra compound stmts.
(build_vec_init): Likewise.
* name-lookup.c (maybe_push_cleanup_level): Use statement lists.
* name-lookup.h (struct cp_binding_level): Add statement_list.
* parser.c (cp_parser_statement): Take the STMT_EXPR node, not a bool.
(cp_parser_labeled_statement, cp_parser_expression_statement,
cp_parser_statement_seq_opt): Likewise.
(cp_parser_compound_statement): Likewise. Take bool for try block.
(cp_parser_selection_statement): Tidy if processing.
(cp_parser_already_scoped_statement): Rewrite to do what it says.
* pt.c (tsubst_copy): Move STMT_EXPR to tsubst_expr.
(tsubst_expr): Rewrite STMT_EXPR processing. Handle STATEMENT_LIST.
Mind COMPOUND_STMT_TRY_BLOCK, EXPR_STMT_STMT_EXPR_RESULT.
* semantics.c (do_poplevel, do_pushlevel): Use statement lists.
(finish_cond): New, rewritten from FINISH_COND.
(simplify_loop_decl_cond): New.
(finish_expr_stmt): Avoid nested EXPR_STMTs.
(begin_if_stmt, finish_if_stmt_cond, finish_then_clause,
begin_else_clause, finish_else_clause, finish_if_stmt,
begin_while_stmt, finish_while_stmt_cond, finish_while_stmt,
begin_do_stmt, finish_do_body, begin_for_stmt, finish_for_init_stmt,
finish_for_cond, finish_for_stmt, begin_switch_stmt,
finish_switch_cond, finish_switch_stmt, begin_try_block,
finish_try_block, finish_cleanup_try_block, finish_function_try_block,
finish_handler_sequence, finish_function_handler_sequence,
begin_handler, finish_handler_parms, finish_handler,
begin_stmt_expr, finish_stmt_expr_expr, finish_stmt_expr): Rewrite
using statement lists.
(begin_compound_stmt): Replace has_no_scope argument with flags.
Update all callers. Use statement lists.
(finish_compound_stmt): Likewise.
(finish_decl_cleanup, finish_eh_cleanup): Use push_cleanup.
(current_scope_stmt_stack): Remove.
(simplify_aggr_init_expr): Don't muck with TREE_CHAIN.
* typeck2.c (split_nonconstant_init_1, split_nonconstant_init):
Rewrite with statement lists.
testsuite/
* g++.dg/ext/stmtexpr1.C: XFAIL.
* gcc.dg/20030612-1.c: XFAIL.
From-SVN: r83221
2004-06-16 03:21:38 +02:00
|
|
|
|
|
2004-06-17 03:06:04 +02:00
|
|
|
|
void
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
c_finish_if_stmt (location_t if_locus, tree cond, tree then_block,
|
|
|
|
|
|
tree else_block, bool nested_if)
|
c-common.c (lang_gimplify_stmt): Remove next_p argument.
* c-common.c (lang_gimplify_stmt): Remove next_p argument.
(if_elt, if_stack, if_stack_space, c_expand_start_cond, c_finish_then,
c_expand_end_cond, c_expand_start_else, c_finish_else, c_begin_if_stmt,
c_begin_while_stmt, c_finish_while_stmt_cond): Move to c-typeck.c.
(finish_fname_decls, fname_decl): Use statement_lists.
(c_expand_expr_stmt): Don't set last_expr_type.
(c_type_hash): Fix indentation.
(c_safe_from_p): Don't follow TREE_CHAIN.
(c_tree_chain_matters_p): Remove.
* c-common.def (SCOPE_STMT): Remove.
(CLEANUP_STMT): Redefine to contain its own body.
* c-common.h (struct stmt_tree_s): Remove x_last_stmt,
x_last_expr_type, x_last_expr_filename, x_scope_stmt_stack.
Add x_cur_stmt_list.
(last_tree, last_expr_type, last_expr_filename, RECHAIN_STMTS): Remove.
(cur_stmt_list): New.
(STATEMENT_LIST_STMT_EXPR): New.
(SCOPE_BEGIN_P, SCOPE_END_P, SCOPE_STMT_BLOCK, SCOPE_NULLIFIED_P,
SCOPE_NO_CLEANUPS_P, SCOPE_PARTIAL_P, NEW_FOR_SCOPE_P): Remove.
(CLEANUP_BODY): New.
(CLEANUP_DECL): Move to operand 2.
(c_common_stmt_codes): Remove SCOPE_STMT.
(COMPOUND_STMT_NO_SCOPE, COMPOUND_STMT_BODY_BLOCK): Remove.
* c-decl.c (c_scope_stmt_stack, current_scope_stmt_stack): Remove.
(c_push_function_context, c_pop_function_context): Don't save it.
(finish_decl): Set TREE_USED on the decl for a cleanup.
Use push_cleanup.
(store_parm_decls): Use statement lists.
(finish_function): Remove compstmt rule workaround. Use statement
lists. Call finish_fname_decls after finalizing the body.
(c_begin_compound_stmt): Move to c-typeck.c.
* c-dump.c (c_dump_tree): Remove SCOPE_STMT.
* c-gimplify.c (gimplify_cleanup_stmt, gimplify_cleanup_stmts): New.
(c_genericize): Invoke them.
(c_gimplify_stmt): Don't look through TREE_CHAIN. Kill SCOPE_STMT.
(c_build_bind_expr): Export.
(gimplify_block, gimplify_cleanup): Remove.
(gimplify_condition): Use gimplify_stmt.
(gimplify_for_stmt): Remove FOR_INIT_STMT chaining hack.
(gimplify_if_stmt): Remove recursion hack.
(c_gimplify_expr): Remove STMT_EXPR handling.
(stmt_expr_last_stmt, gimplify_stmt_expr): Remove.
(is_last_stmt_of_scope): Remove.
* c-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
* c-mudflap.c (mflang_flush_calls): Use c_begin_compound_stmt,
c_end_compound_stmt.
* c-objc-common.c (build_cdtor): Likewise.
* c-parse.in (primary): Use c_finish_stmt_expr.
(push_scope, pop_scope): Remove.
(c99_block_start, compstmt_start): Use c_begin_compound_stmt.
(c99_block_end, compstmt): Use c_end_compound_stmt.
(c99_block_lineno_labeled_stmt): Likewise.
(compstmt_primary_start): Use c_begin_stmt_expr.
(simple_if, select_or_iter_stmt): Update calls to stmt builders.
(do_stmt_start): Fill in body directly.
(lineno_stmt): Avoid setting lineno on constants.
* c-pretty-print.c (pp_c_statement): Handle STATEMENT_LIST.
Remove SCOPE_STMT.
* c-semantics.c (begin_stmt_tree): Remove.
(push_stmt_list, re_push_stmt_list, pop_stmt_list): New.
(add_stmt): Use statement lists.
(add_scope_stmt, finish_stmt_tree): Remove.
(push_cleanup): New.
* c-tree.h: Move some decls from c-common.h.
* c-typeck.c (c_tree_expr_nonnegative_p): Simplify for statement lists.
(do_case, c_finish_case): Likewise.
(c_finish_then): Take body for then as argument.
(c_finish_else): Similarly.
(c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): New.
(c_begin_stmt_expr, c_finish_stmt_expr): New.
(c_begin_compound_stmt): Do scope management.
(c_end_compound_stmt): New.
* fold-const.c (tree_expr_nonnegative_p): Fix BIND_EXPR.
* gimplify.c (voidify_wrapper_expr): Accept temporary argument.
Look through exception handling constructs.
(gimplify_bind_expr): Accept temporary argument.
(gimplify_target_expr): Special case BIND_EXPR bodies.
(gimplify_expr): Handle fallback == fb_none like a statement.
* langhooks-def.h (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Kill.
* langhooks.c (lhd_tree_inlining_tree_chain_matters_p): Remove.
* langhooks.h (tree_chain_matters_p): Remove.
* stub-objc.c (objc_clear_super_receiver): New.
* tree-gimple.h (voidify_wrapper_expr): Update decl.
(append_to_statement_list, append_to_statement_list_force): Move
to tree-iterator.h.
* tree-inline.c (expand_call_inline): Update call.
(clone_body): Use statement lists.
(walk_tree): Don't check tree_chain_matters_p.
(copy_tree_r): Likewise.
* tree-iterator.c (alloc_stmt_list): Clear lang bits.
(tsi_link_before, tsi_link_after): Set TREE_SIDE_EFFECTS properly.
* tree-iterator.h (append_to_statement_list,
append_to_statement_list_force): Moved from tree-gimple.h.
* tree-pretty-print.c (dump_generic_node): Clean up TARGET_EXPR dump.
* objc/objc-act.c (build_module_descriptor): Use c_begin_compound_stmt.
(objc_enter_block): Likewise.
(objc_exit_block): Use c_end_compound_stmt.
(objc_build_try_enter_fragment): Add #error and comment for
rewriting for OBJCPLUS.
(objc_build_extract_fragment, objc_build_try_epilogue,
objc_build_catch_stmt, objc_build_finally_prologue,
objc_build_finally_epilogue): Update for C statement builders.
* objc/objc-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P):
Remove.
cp/
* call.c (initialize_reference): Don't build CLEANUP_STMT here.
* cp-gimplify.c (cp_gimplify_stmt): Remove next_p argument.
(genericize_try_block): Use gimplify_stmt.
(genericize_catch_block, genericize_eh_spec_block): Likewise.
(cp_gimplify_init_expr): Remove STMT_EXPR special case.
(gimplify_must_not_throw_expr): Update voidify_wrapper_expr call.
* cp-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
(cp_tree_chain_matters_p): Remove.
* cp-tree.h (COMPOUND_STMT_TRY_BLOCK): New.
(COMPOUND_STMT_BODY_BLOCK): New.
(STATEMENT_LIST_NO_SCOPE, STATEMENT_LIST_TRY_BLOCK): New.
(EXPR_STMT_STMT_EXPR_RESULT): New.
(building_stmt_tree): Check cur_stmt_list.
(tf_stmt_expr_cmpd, tf_stmt_expr_body): Remove.
(BCS_NO_SCOPE, BCS_TRY_BLOCK, BCS_FN_BODY): New.
* decl.c (poplevel): Use pop_stmt_list for minding cleanups.
(cp_finish_decl): Use push_cleanup.
(start_function, finish_function): Use statement lists.
(finish_stmt): Do nothing.
* except.c (begin_eh_spec_block): Use statement lists.
(check_handlers_1, check_handlers): Likewise.
* init.c (construct_virtual_base): Don't add extra compound stmts.
(build_vec_init): Likewise.
* name-lookup.c (maybe_push_cleanup_level): Use statement lists.
* name-lookup.h (struct cp_binding_level): Add statement_list.
* parser.c (cp_parser_statement): Take the STMT_EXPR node, not a bool.
(cp_parser_labeled_statement, cp_parser_expression_statement,
cp_parser_statement_seq_opt): Likewise.
(cp_parser_compound_statement): Likewise. Take bool for try block.
(cp_parser_selection_statement): Tidy if processing.
(cp_parser_already_scoped_statement): Rewrite to do what it says.
* pt.c (tsubst_copy): Move STMT_EXPR to tsubst_expr.
(tsubst_expr): Rewrite STMT_EXPR processing. Handle STATEMENT_LIST.
Mind COMPOUND_STMT_TRY_BLOCK, EXPR_STMT_STMT_EXPR_RESULT.
* semantics.c (do_poplevel, do_pushlevel): Use statement lists.
(finish_cond): New, rewritten from FINISH_COND.
(simplify_loop_decl_cond): New.
(finish_expr_stmt): Avoid nested EXPR_STMTs.
(begin_if_stmt, finish_if_stmt_cond, finish_then_clause,
begin_else_clause, finish_else_clause, finish_if_stmt,
begin_while_stmt, finish_while_stmt_cond, finish_while_stmt,
begin_do_stmt, finish_do_body, begin_for_stmt, finish_for_init_stmt,
finish_for_cond, finish_for_stmt, begin_switch_stmt,
finish_switch_cond, finish_switch_stmt, begin_try_block,
finish_try_block, finish_cleanup_try_block, finish_function_try_block,
finish_handler_sequence, finish_function_handler_sequence,
begin_handler, finish_handler_parms, finish_handler,
begin_stmt_expr, finish_stmt_expr_expr, finish_stmt_expr): Rewrite
using statement lists.
(begin_compound_stmt): Replace has_no_scope argument with flags.
Update all callers. Use statement lists.
(finish_compound_stmt): Likewise.
(finish_decl_cleanup, finish_eh_cleanup): Use push_cleanup.
(current_scope_stmt_stack): Remove.
(simplify_aggr_init_expr): Don't muck with TREE_CHAIN.
* typeck2.c (split_nonconstant_init_1, split_nonconstant_init):
Rewrite with statement lists.
testsuite/
* g++.dg/ext/stmtexpr1.C: XFAIL.
* gcc.dg/20030612-1.c: XFAIL.
From-SVN: r83221
2004-06-16 03:21:38 +02:00
|
|
|
|
{
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
tree stmt;
|
c-common.c (lang_gimplify_stmt): Remove next_p argument.
* c-common.c (lang_gimplify_stmt): Remove next_p argument.
(if_elt, if_stack, if_stack_space, c_expand_start_cond, c_finish_then,
c_expand_end_cond, c_expand_start_else, c_finish_else, c_begin_if_stmt,
c_begin_while_stmt, c_finish_while_stmt_cond): Move to c-typeck.c.
(finish_fname_decls, fname_decl): Use statement_lists.
(c_expand_expr_stmt): Don't set last_expr_type.
(c_type_hash): Fix indentation.
(c_safe_from_p): Don't follow TREE_CHAIN.
(c_tree_chain_matters_p): Remove.
* c-common.def (SCOPE_STMT): Remove.
(CLEANUP_STMT): Redefine to contain its own body.
* c-common.h (struct stmt_tree_s): Remove x_last_stmt,
x_last_expr_type, x_last_expr_filename, x_scope_stmt_stack.
Add x_cur_stmt_list.
(last_tree, last_expr_type, last_expr_filename, RECHAIN_STMTS): Remove.
(cur_stmt_list): New.
(STATEMENT_LIST_STMT_EXPR): New.
(SCOPE_BEGIN_P, SCOPE_END_P, SCOPE_STMT_BLOCK, SCOPE_NULLIFIED_P,
SCOPE_NO_CLEANUPS_P, SCOPE_PARTIAL_P, NEW_FOR_SCOPE_P): Remove.
(CLEANUP_BODY): New.
(CLEANUP_DECL): Move to operand 2.
(c_common_stmt_codes): Remove SCOPE_STMT.
(COMPOUND_STMT_NO_SCOPE, COMPOUND_STMT_BODY_BLOCK): Remove.
* c-decl.c (c_scope_stmt_stack, current_scope_stmt_stack): Remove.
(c_push_function_context, c_pop_function_context): Don't save it.
(finish_decl): Set TREE_USED on the decl for a cleanup.
Use push_cleanup.
(store_parm_decls): Use statement lists.
(finish_function): Remove compstmt rule workaround. Use statement
lists. Call finish_fname_decls after finalizing the body.
(c_begin_compound_stmt): Move to c-typeck.c.
* c-dump.c (c_dump_tree): Remove SCOPE_STMT.
* c-gimplify.c (gimplify_cleanup_stmt, gimplify_cleanup_stmts): New.
(c_genericize): Invoke them.
(c_gimplify_stmt): Don't look through TREE_CHAIN. Kill SCOPE_STMT.
(c_build_bind_expr): Export.
(gimplify_block, gimplify_cleanup): Remove.
(gimplify_condition): Use gimplify_stmt.
(gimplify_for_stmt): Remove FOR_INIT_STMT chaining hack.
(gimplify_if_stmt): Remove recursion hack.
(c_gimplify_expr): Remove STMT_EXPR handling.
(stmt_expr_last_stmt, gimplify_stmt_expr): Remove.
(is_last_stmt_of_scope): Remove.
* c-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
* c-mudflap.c (mflang_flush_calls): Use c_begin_compound_stmt,
c_end_compound_stmt.
* c-objc-common.c (build_cdtor): Likewise.
* c-parse.in (primary): Use c_finish_stmt_expr.
(push_scope, pop_scope): Remove.
(c99_block_start, compstmt_start): Use c_begin_compound_stmt.
(c99_block_end, compstmt): Use c_end_compound_stmt.
(c99_block_lineno_labeled_stmt): Likewise.
(compstmt_primary_start): Use c_begin_stmt_expr.
(simple_if, select_or_iter_stmt): Update calls to stmt builders.
(do_stmt_start): Fill in body directly.
(lineno_stmt): Avoid setting lineno on constants.
* c-pretty-print.c (pp_c_statement): Handle STATEMENT_LIST.
Remove SCOPE_STMT.
* c-semantics.c (begin_stmt_tree): Remove.
(push_stmt_list, re_push_stmt_list, pop_stmt_list): New.
(add_stmt): Use statement lists.
(add_scope_stmt, finish_stmt_tree): Remove.
(push_cleanup): New.
* c-tree.h: Move some decls from c-common.h.
* c-typeck.c (c_tree_expr_nonnegative_p): Simplify for statement lists.
(do_case, c_finish_case): Likewise.
(c_finish_then): Take body for then as argument.
(c_finish_else): Similarly.
(c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): New.
(c_begin_stmt_expr, c_finish_stmt_expr): New.
(c_begin_compound_stmt): Do scope management.
(c_end_compound_stmt): New.
* fold-const.c (tree_expr_nonnegative_p): Fix BIND_EXPR.
* gimplify.c (voidify_wrapper_expr): Accept temporary argument.
Look through exception handling constructs.
(gimplify_bind_expr): Accept temporary argument.
(gimplify_target_expr): Special case BIND_EXPR bodies.
(gimplify_expr): Handle fallback == fb_none like a statement.
* langhooks-def.h (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Kill.
* langhooks.c (lhd_tree_inlining_tree_chain_matters_p): Remove.
* langhooks.h (tree_chain_matters_p): Remove.
* stub-objc.c (objc_clear_super_receiver): New.
* tree-gimple.h (voidify_wrapper_expr): Update decl.
(append_to_statement_list, append_to_statement_list_force): Move
to tree-iterator.h.
* tree-inline.c (expand_call_inline): Update call.
(clone_body): Use statement lists.
(walk_tree): Don't check tree_chain_matters_p.
(copy_tree_r): Likewise.
* tree-iterator.c (alloc_stmt_list): Clear lang bits.
(tsi_link_before, tsi_link_after): Set TREE_SIDE_EFFECTS properly.
* tree-iterator.h (append_to_statement_list,
append_to_statement_list_force): Moved from tree-gimple.h.
* tree-pretty-print.c (dump_generic_node): Clean up TARGET_EXPR dump.
* objc/objc-act.c (build_module_descriptor): Use c_begin_compound_stmt.
(objc_enter_block): Likewise.
(objc_exit_block): Use c_end_compound_stmt.
(objc_build_try_enter_fragment): Add #error and comment for
rewriting for OBJCPLUS.
(objc_build_extract_fragment, objc_build_try_epilogue,
objc_build_catch_stmt, objc_build_finally_prologue,
objc_build_finally_epilogue): Update for C statement builders.
* objc/objc-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P):
Remove.
cp/
* call.c (initialize_reference): Don't build CLEANUP_STMT here.
* cp-gimplify.c (cp_gimplify_stmt): Remove next_p argument.
(genericize_try_block): Use gimplify_stmt.
(genericize_catch_block, genericize_eh_spec_block): Likewise.
(cp_gimplify_init_expr): Remove STMT_EXPR special case.
(gimplify_must_not_throw_expr): Update voidify_wrapper_expr call.
* cp-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
(cp_tree_chain_matters_p): Remove.
* cp-tree.h (COMPOUND_STMT_TRY_BLOCK): New.
(COMPOUND_STMT_BODY_BLOCK): New.
(STATEMENT_LIST_NO_SCOPE, STATEMENT_LIST_TRY_BLOCK): New.
(EXPR_STMT_STMT_EXPR_RESULT): New.
(building_stmt_tree): Check cur_stmt_list.
(tf_stmt_expr_cmpd, tf_stmt_expr_body): Remove.
(BCS_NO_SCOPE, BCS_TRY_BLOCK, BCS_FN_BODY): New.
* decl.c (poplevel): Use pop_stmt_list for minding cleanups.
(cp_finish_decl): Use push_cleanup.
(start_function, finish_function): Use statement lists.
(finish_stmt): Do nothing.
* except.c (begin_eh_spec_block): Use statement lists.
(check_handlers_1, check_handlers): Likewise.
* init.c (construct_virtual_base): Don't add extra compound stmts.
(build_vec_init): Likewise.
* name-lookup.c (maybe_push_cleanup_level): Use statement lists.
* name-lookup.h (struct cp_binding_level): Add statement_list.
* parser.c (cp_parser_statement): Take the STMT_EXPR node, not a bool.
(cp_parser_labeled_statement, cp_parser_expression_statement,
cp_parser_statement_seq_opt): Likewise.
(cp_parser_compound_statement): Likewise. Take bool for try block.
(cp_parser_selection_statement): Tidy if processing.
(cp_parser_already_scoped_statement): Rewrite to do what it says.
* pt.c (tsubst_copy): Move STMT_EXPR to tsubst_expr.
(tsubst_expr): Rewrite STMT_EXPR processing. Handle STATEMENT_LIST.
Mind COMPOUND_STMT_TRY_BLOCK, EXPR_STMT_STMT_EXPR_RESULT.
* semantics.c (do_poplevel, do_pushlevel): Use statement lists.
(finish_cond): New, rewritten from FINISH_COND.
(simplify_loop_decl_cond): New.
(finish_expr_stmt): Avoid nested EXPR_STMTs.
(begin_if_stmt, finish_if_stmt_cond, finish_then_clause,
begin_else_clause, finish_else_clause, finish_if_stmt,
begin_while_stmt, finish_while_stmt_cond, finish_while_stmt,
begin_do_stmt, finish_do_body, begin_for_stmt, finish_for_init_stmt,
finish_for_cond, finish_for_stmt, begin_switch_stmt,
finish_switch_cond, finish_switch_stmt, begin_try_block,
finish_try_block, finish_cleanup_try_block, finish_function_try_block,
finish_handler_sequence, finish_function_handler_sequence,
begin_handler, finish_handler_parms, finish_handler,
begin_stmt_expr, finish_stmt_expr_expr, finish_stmt_expr): Rewrite
using statement lists.
(begin_compound_stmt): Replace has_no_scope argument with flags.
Update all callers. Use statement lists.
(finish_compound_stmt): Likewise.
(finish_decl_cleanup, finish_eh_cleanup): Use push_cleanup.
(current_scope_stmt_stack): Remove.
(simplify_aggr_init_expr): Don't muck with TREE_CHAIN.
* typeck2.c (split_nonconstant_init_1, split_nonconstant_init):
Rewrite with statement lists.
testsuite/
* g++.dg/ext/stmtexpr1.C: XFAIL.
* gcc.dg/20030612-1.c: XFAIL.
From-SVN: r83221
2004-06-16 03:21:38 +02:00
|
|
|
|
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
/* Diagnose an ambiguous else if if-then-else is nested inside if-then. */
|
|
|
|
|
|
if (warn_parentheses && nested_if && else_block == NULL)
|
c-common.c (lang_gimplify_stmt): Remove next_p argument.
* c-common.c (lang_gimplify_stmt): Remove next_p argument.
(if_elt, if_stack, if_stack_space, c_expand_start_cond, c_finish_then,
c_expand_end_cond, c_expand_start_else, c_finish_else, c_begin_if_stmt,
c_begin_while_stmt, c_finish_while_stmt_cond): Move to c-typeck.c.
(finish_fname_decls, fname_decl): Use statement_lists.
(c_expand_expr_stmt): Don't set last_expr_type.
(c_type_hash): Fix indentation.
(c_safe_from_p): Don't follow TREE_CHAIN.
(c_tree_chain_matters_p): Remove.
* c-common.def (SCOPE_STMT): Remove.
(CLEANUP_STMT): Redefine to contain its own body.
* c-common.h (struct stmt_tree_s): Remove x_last_stmt,
x_last_expr_type, x_last_expr_filename, x_scope_stmt_stack.
Add x_cur_stmt_list.
(last_tree, last_expr_type, last_expr_filename, RECHAIN_STMTS): Remove.
(cur_stmt_list): New.
(STATEMENT_LIST_STMT_EXPR): New.
(SCOPE_BEGIN_P, SCOPE_END_P, SCOPE_STMT_BLOCK, SCOPE_NULLIFIED_P,
SCOPE_NO_CLEANUPS_P, SCOPE_PARTIAL_P, NEW_FOR_SCOPE_P): Remove.
(CLEANUP_BODY): New.
(CLEANUP_DECL): Move to operand 2.
(c_common_stmt_codes): Remove SCOPE_STMT.
(COMPOUND_STMT_NO_SCOPE, COMPOUND_STMT_BODY_BLOCK): Remove.
* c-decl.c (c_scope_stmt_stack, current_scope_stmt_stack): Remove.
(c_push_function_context, c_pop_function_context): Don't save it.
(finish_decl): Set TREE_USED on the decl for a cleanup.
Use push_cleanup.
(store_parm_decls): Use statement lists.
(finish_function): Remove compstmt rule workaround. Use statement
lists. Call finish_fname_decls after finalizing the body.
(c_begin_compound_stmt): Move to c-typeck.c.
* c-dump.c (c_dump_tree): Remove SCOPE_STMT.
* c-gimplify.c (gimplify_cleanup_stmt, gimplify_cleanup_stmts): New.
(c_genericize): Invoke them.
(c_gimplify_stmt): Don't look through TREE_CHAIN. Kill SCOPE_STMT.
(c_build_bind_expr): Export.
(gimplify_block, gimplify_cleanup): Remove.
(gimplify_condition): Use gimplify_stmt.
(gimplify_for_stmt): Remove FOR_INIT_STMT chaining hack.
(gimplify_if_stmt): Remove recursion hack.
(c_gimplify_expr): Remove STMT_EXPR handling.
(stmt_expr_last_stmt, gimplify_stmt_expr): Remove.
(is_last_stmt_of_scope): Remove.
* c-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
* c-mudflap.c (mflang_flush_calls): Use c_begin_compound_stmt,
c_end_compound_stmt.
* c-objc-common.c (build_cdtor): Likewise.
* c-parse.in (primary): Use c_finish_stmt_expr.
(push_scope, pop_scope): Remove.
(c99_block_start, compstmt_start): Use c_begin_compound_stmt.
(c99_block_end, compstmt): Use c_end_compound_stmt.
(c99_block_lineno_labeled_stmt): Likewise.
(compstmt_primary_start): Use c_begin_stmt_expr.
(simple_if, select_or_iter_stmt): Update calls to stmt builders.
(do_stmt_start): Fill in body directly.
(lineno_stmt): Avoid setting lineno on constants.
* c-pretty-print.c (pp_c_statement): Handle STATEMENT_LIST.
Remove SCOPE_STMT.
* c-semantics.c (begin_stmt_tree): Remove.
(push_stmt_list, re_push_stmt_list, pop_stmt_list): New.
(add_stmt): Use statement lists.
(add_scope_stmt, finish_stmt_tree): Remove.
(push_cleanup): New.
* c-tree.h: Move some decls from c-common.h.
* c-typeck.c (c_tree_expr_nonnegative_p): Simplify for statement lists.
(do_case, c_finish_case): Likewise.
(c_finish_then): Take body for then as argument.
(c_finish_else): Similarly.
(c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): New.
(c_begin_stmt_expr, c_finish_stmt_expr): New.
(c_begin_compound_stmt): Do scope management.
(c_end_compound_stmt): New.
* fold-const.c (tree_expr_nonnegative_p): Fix BIND_EXPR.
* gimplify.c (voidify_wrapper_expr): Accept temporary argument.
Look through exception handling constructs.
(gimplify_bind_expr): Accept temporary argument.
(gimplify_target_expr): Special case BIND_EXPR bodies.
(gimplify_expr): Handle fallback == fb_none like a statement.
* langhooks-def.h (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Kill.
* langhooks.c (lhd_tree_inlining_tree_chain_matters_p): Remove.
* langhooks.h (tree_chain_matters_p): Remove.
* stub-objc.c (objc_clear_super_receiver): New.
* tree-gimple.h (voidify_wrapper_expr): Update decl.
(append_to_statement_list, append_to_statement_list_force): Move
to tree-iterator.h.
* tree-inline.c (expand_call_inline): Update call.
(clone_body): Use statement lists.
(walk_tree): Don't check tree_chain_matters_p.
(copy_tree_r): Likewise.
* tree-iterator.c (alloc_stmt_list): Clear lang bits.
(tsi_link_before, tsi_link_after): Set TREE_SIDE_EFFECTS properly.
* tree-iterator.h (append_to_statement_list,
append_to_statement_list_force): Moved from tree-gimple.h.
* tree-pretty-print.c (dump_generic_node): Clean up TARGET_EXPR dump.
* objc/objc-act.c (build_module_descriptor): Use c_begin_compound_stmt.
(objc_enter_block): Likewise.
(objc_exit_block): Use c_end_compound_stmt.
(objc_build_try_enter_fragment): Add #error and comment for
rewriting for OBJCPLUS.
(objc_build_extract_fragment, objc_build_try_epilogue,
objc_build_catch_stmt, objc_build_finally_prologue,
objc_build_finally_epilogue): Update for C statement builders.
* objc/objc-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P):
Remove.
cp/
* call.c (initialize_reference): Don't build CLEANUP_STMT here.
* cp-gimplify.c (cp_gimplify_stmt): Remove next_p argument.
(genericize_try_block): Use gimplify_stmt.
(genericize_catch_block, genericize_eh_spec_block): Likewise.
(cp_gimplify_init_expr): Remove STMT_EXPR special case.
(gimplify_must_not_throw_expr): Update voidify_wrapper_expr call.
* cp-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
(cp_tree_chain_matters_p): Remove.
* cp-tree.h (COMPOUND_STMT_TRY_BLOCK): New.
(COMPOUND_STMT_BODY_BLOCK): New.
(STATEMENT_LIST_NO_SCOPE, STATEMENT_LIST_TRY_BLOCK): New.
(EXPR_STMT_STMT_EXPR_RESULT): New.
(building_stmt_tree): Check cur_stmt_list.
(tf_stmt_expr_cmpd, tf_stmt_expr_body): Remove.
(BCS_NO_SCOPE, BCS_TRY_BLOCK, BCS_FN_BODY): New.
* decl.c (poplevel): Use pop_stmt_list for minding cleanups.
(cp_finish_decl): Use push_cleanup.
(start_function, finish_function): Use statement lists.
(finish_stmt): Do nothing.
* except.c (begin_eh_spec_block): Use statement lists.
(check_handlers_1, check_handlers): Likewise.
* init.c (construct_virtual_base): Don't add extra compound stmts.
(build_vec_init): Likewise.
* name-lookup.c (maybe_push_cleanup_level): Use statement lists.
* name-lookup.h (struct cp_binding_level): Add statement_list.
* parser.c (cp_parser_statement): Take the STMT_EXPR node, not a bool.
(cp_parser_labeled_statement, cp_parser_expression_statement,
cp_parser_statement_seq_opt): Likewise.
(cp_parser_compound_statement): Likewise. Take bool for try block.
(cp_parser_selection_statement): Tidy if processing.
(cp_parser_already_scoped_statement): Rewrite to do what it says.
* pt.c (tsubst_copy): Move STMT_EXPR to tsubst_expr.
(tsubst_expr): Rewrite STMT_EXPR processing. Handle STATEMENT_LIST.
Mind COMPOUND_STMT_TRY_BLOCK, EXPR_STMT_STMT_EXPR_RESULT.
* semantics.c (do_poplevel, do_pushlevel): Use statement lists.
(finish_cond): New, rewritten from FINISH_COND.
(simplify_loop_decl_cond): New.
(finish_expr_stmt): Avoid nested EXPR_STMTs.
(begin_if_stmt, finish_if_stmt_cond, finish_then_clause,
begin_else_clause, finish_else_clause, finish_if_stmt,
begin_while_stmt, finish_while_stmt_cond, finish_while_stmt,
begin_do_stmt, finish_do_body, begin_for_stmt, finish_for_init_stmt,
finish_for_cond, finish_for_stmt, begin_switch_stmt,
finish_switch_cond, finish_switch_stmt, begin_try_block,
finish_try_block, finish_cleanup_try_block, finish_function_try_block,
finish_handler_sequence, finish_function_handler_sequence,
begin_handler, finish_handler_parms, finish_handler,
begin_stmt_expr, finish_stmt_expr_expr, finish_stmt_expr): Rewrite
using statement lists.
(begin_compound_stmt): Replace has_no_scope argument with flags.
Update all callers. Use statement lists.
(finish_compound_stmt): Likewise.
(finish_decl_cleanup, finish_eh_cleanup): Use push_cleanup.
(current_scope_stmt_stack): Remove.
(simplify_aggr_init_expr): Don't muck with TREE_CHAIN.
* typeck2.c (split_nonconstant_init_1, split_nonconstant_init):
Rewrite with statement lists.
testsuite/
* g++.dg/ext/stmtexpr1.C: XFAIL.
* gcc.dg/20030612-1.c: XFAIL.
From-SVN: r83221
2004-06-16 03:21:38 +02:00
|
|
|
|
{
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
tree inner_if = then_block;
|
2004-06-17 01:05:37 +02:00
|
|
|
|
|
c-typeck.c, [...]: Fix comment typos.
* c-typeck.c, cfgexpand.c, ddg.c, ddg.h, df.c, fold-const.c,
gcov.c, gimplify.c, modulo-sched.c, passes.c, tree-cfg.c,
tree-mudflap.c, tree-nrv.c, tree-outof-ssa.c, tree-ssa-dom.c,
tree-ssa-dse.c, tree-ssa-operands.c, tree-ssa-pre.c,
tree-tailcall.c: Fix comment typos. Follow spelling
conventions.
From-SVN: r83703
2004-06-26 07:03:55 +02:00
|
|
|
|
/* We know from the grammar productions that there is an IF nested
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
within THEN_BLOCK. Due to labels and c99 conditional declarations,
|
|
|
|
|
|
it might not be exactly THEN_BLOCK, but should be the last
|
|
|
|
|
|
non-container statement within. */
|
|
|
|
|
|
while (1)
|
|
|
|
|
|
switch (TREE_CODE (inner_if))
|
|
|
|
|
|
{
|
|
|
|
|
|
case COND_EXPR:
|
|
|
|
|
|
goto found;
|
|
|
|
|
|
case BIND_EXPR:
|
|
|
|
|
|
inner_if = BIND_EXPR_BODY (inner_if);
|
|
|
|
|
|
break;
|
|
|
|
|
|
case STATEMENT_LIST:
|
|
|
|
|
|
inner_if = expr_last (then_block);
|
|
|
|
|
|
break;
|
|
|
|
|
|
case TRY_FINALLY_EXPR:
|
|
|
|
|
|
case TRY_CATCH_EXPR:
|
|
|
|
|
|
inner_if = TREE_OPERAND (inner_if, 0);
|
|
|
|
|
|
break;
|
|
|
|
|
|
default:
|
|
|
|
|
|
abort ();
|
|
|
|
|
|
}
|
|
|
|
|
|
found:
|
2004-06-17 01:05:37 +02:00
|
|
|
|
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
if (COND_EXPR_ELSE (inner_if))
|
|
|
|
|
|
warning ("%Hsuggest explicit braces to avoid ambiguous `else'",
|
|
|
|
|
|
&if_locus);
|
|
|
|
|
|
}
|
2004-06-17 01:05:37 +02:00
|
|
|
|
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
/* Diagnose ";" via the special empty statement node that we create. */
|
|
|
|
|
|
if (extra_warnings)
|
2004-06-17 01:05:37 +02:00
|
|
|
|
{
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
if (TREE_CODE (then_block) == NOP_EXPR && !TREE_TYPE (then_block))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (!else_block)
|
|
|
|
|
|
warning ("%Hempty body in an if-statement",
|
|
|
|
|
|
EXPR_LOCUS (then_block));
|
|
|
|
|
|
then_block = alloc_stmt_list ();
|
|
|
|
|
|
}
|
|
|
|
|
|
if (else_block
|
|
|
|
|
|
&& TREE_CODE (else_block) == NOP_EXPR
|
|
|
|
|
|
&& !TREE_TYPE (else_block))
|
|
|
|
|
|
{
|
|
|
|
|
|
warning ("%Hempty body in an else-statement",
|
|
|
|
|
|
EXPR_LOCUS (else_block));
|
|
|
|
|
|
else_block = alloc_stmt_list ();
|
|
|
|
|
|
}
|
2004-06-17 01:05:37 +02:00
|
|
|
|
}
|
c-common.c (lang_gimplify_stmt): Remove next_p argument.
* c-common.c (lang_gimplify_stmt): Remove next_p argument.
(if_elt, if_stack, if_stack_space, c_expand_start_cond, c_finish_then,
c_expand_end_cond, c_expand_start_else, c_finish_else, c_begin_if_stmt,
c_begin_while_stmt, c_finish_while_stmt_cond): Move to c-typeck.c.
(finish_fname_decls, fname_decl): Use statement_lists.
(c_expand_expr_stmt): Don't set last_expr_type.
(c_type_hash): Fix indentation.
(c_safe_from_p): Don't follow TREE_CHAIN.
(c_tree_chain_matters_p): Remove.
* c-common.def (SCOPE_STMT): Remove.
(CLEANUP_STMT): Redefine to contain its own body.
* c-common.h (struct stmt_tree_s): Remove x_last_stmt,
x_last_expr_type, x_last_expr_filename, x_scope_stmt_stack.
Add x_cur_stmt_list.
(last_tree, last_expr_type, last_expr_filename, RECHAIN_STMTS): Remove.
(cur_stmt_list): New.
(STATEMENT_LIST_STMT_EXPR): New.
(SCOPE_BEGIN_P, SCOPE_END_P, SCOPE_STMT_BLOCK, SCOPE_NULLIFIED_P,
SCOPE_NO_CLEANUPS_P, SCOPE_PARTIAL_P, NEW_FOR_SCOPE_P): Remove.
(CLEANUP_BODY): New.
(CLEANUP_DECL): Move to operand 2.
(c_common_stmt_codes): Remove SCOPE_STMT.
(COMPOUND_STMT_NO_SCOPE, COMPOUND_STMT_BODY_BLOCK): Remove.
* c-decl.c (c_scope_stmt_stack, current_scope_stmt_stack): Remove.
(c_push_function_context, c_pop_function_context): Don't save it.
(finish_decl): Set TREE_USED on the decl for a cleanup.
Use push_cleanup.
(store_parm_decls): Use statement lists.
(finish_function): Remove compstmt rule workaround. Use statement
lists. Call finish_fname_decls after finalizing the body.
(c_begin_compound_stmt): Move to c-typeck.c.
* c-dump.c (c_dump_tree): Remove SCOPE_STMT.
* c-gimplify.c (gimplify_cleanup_stmt, gimplify_cleanup_stmts): New.
(c_genericize): Invoke them.
(c_gimplify_stmt): Don't look through TREE_CHAIN. Kill SCOPE_STMT.
(c_build_bind_expr): Export.
(gimplify_block, gimplify_cleanup): Remove.
(gimplify_condition): Use gimplify_stmt.
(gimplify_for_stmt): Remove FOR_INIT_STMT chaining hack.
(gimplify_if_stmt): Remove recursion hack.
(c_gimplify_expr): Remove STMT_EXPR handling.
(stmt_expr_last_stmt, gimplify_stmt_expr): Remove.
(is_last_stmt_of_scope): Remove.
* c-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
* c-mudflap.c (mflang_flush_calls): Use c_begin_compound_stmt,
c_end_compound_stmt.
* c-objc-common.c (build_cdtor): Likewise.
* c-parse.in (primary): Use c_finish_stmt_expr.
(push_scope, pop_scope): Remove.
(c99_block_start, compstmt_start): Use c_begin_compound_stmt.
(c99_block_end, compstmt): Use c_end_compound_stmt.
(c99_block_lineno_labeled_stmt): Likewise.
(compstmt_primary_start): Use c_begin_stmt_expr.
(simple_if, select_or_iter_stmt): Update calls to stmt builders.
(do_stmt_start): Fill in body directly.
(lineno_stmt): Avoid setting lineno on constants.
* c-pretty-print.c (pp_c_statement): Handle STATEMENT_LIST.
Remove SCOPE_STMT.
* c-semantics.c (begin_stmt_tree): Remove.
(push_stmt_list, re_push_stmt_list, pop_stmt_list): New.
(add_stmt): Use statement lists.
(add_scope_stmt, finish_stmt_tree): Remove.
(push_cleanup): New.
* c-tree.h: Move some decls from c-common.h.
* c-typeck.c (c_tree_expr_nonnegative_p): Simplify for statement lists.
(do_case, c_finish_case): Likewise.
(c_finish_then): Take body for then as argument.
(c_finish_else): Similarly.
(c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): New.
(c_begin_stmt_expr, c_finish_stmt_expr): New.
(c_begin_compound_stmt): Do scope management.
(c_end_compound_stmt): New.
* fold-const.c (tree_expr_nonnegative_p): Fix BIND_EXPR.
* gimplify.c (voidify_wrapper_expr): Accept temporary argument.
Look through exception handling constructs.
(gimplify_bind_expr): Accept temporary argument.
(gimplify_target_expr): Special case BIND_EXPR bodies.
(gimplify_expr): Handle fallback == fb_none like a statement.
* langhooks-def.h (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Kill.
* langhooks.c (lhd_tree_inlining_tree_chain_matters_p): Remove.
* langhooks.h (tree_chain_matters_p): Remove.
* stub-objc.c (objc_clear_super_receiver): New.
* tree-gimple.h (voidify_wrapper_expr): Update decl.
(append_to_statement_list, append_to_statement_list_force): Move
to tree-iterator.h.
* tree-inline.c (expand_call_inline): Update call.
(clone_body): Use statement lists.
(walk_tree): Don't check tree_chain_matters_p.
(copy_tree_r): Likewise.
* tree-iterator.c (alloc_stmt_list): Clear lang bits.
(tsi_link_before, tsi_link_after): Set TREE_SIDE_EFFECTS properly.
* tree-iterator.h (append_to_statement_list,
append_to_statement_list_force): Moved from tree-gimple.h.
* tree-pretty-print.c (dump_generic_node): Clean up TARGET_EXPR dump.
* objc/objc-act.c (build_module_descriptor): Use c_begin_compound_stmt.
(objc_enter_block): Likewise.
(objc_exit_block): Use c_end_compound_stmt.
(objc_build_try_enter_fragment): Add #error and comment for
rewriting for OBJCPLUS.
(objc_build_extract_fragment, objc_build_try_epilogue,
objc_build_catch_stmt, objc_build_finally_prologue,
objc_build_finally_epilogue): Update for C statement builders.
* objc/objc-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P):
Remove.
cp/
* call.c (initialize_reference): Don't build CLEANUP_STMT here.
* cp-gimplify.c (cp_gimplify_stmt): Remove next_p argument.
(genericize_try_block): Use gimplify_stmt.
(genericize_catch_block, genericize_eh_spec_block): Likewise.
(cp_gimplify_init_expr): Remove STMT_EXPR special case.
(gimplify_must_not_throw_expr): Update voidify_wrapper_expr call.
* cp-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
(cp_tree_chain_matters_p): Remove.
* cp-tree.h (COMPOUND_STMT_TRY_BLOCK): New.
(COMPOUND_STMT_BODY_BLOCK): New.
(STATEMENT_LIST_NO_SCOPE, STATEMENT_LIST_TRY_BLOCK): New.
(EXPR_STMT_STMT_EXPR_RESULT): New.
(building_stmt_tree): Check cur_stmt_list.
(tf_stmt_expr_cmpd, tf_stmt_expr_body): Remove.
(BCS_NO_SCOPE, BCS_TRY_BLOCK, BCS_FN_BODY): New.
* decl.c (poplevel): Use pop_stmt_list for minding cleanups.
(cp_finish_decl): Use push_cleanup.
(start_function, finish_function): Use statement lists.
(finish_stmt): Do nothing.
* except.c (begin_eh_spec_block): Use statement lists.
(check_handlers_1, check_handlers): Likewise.
* init.c (construct_virtual_base): Don't add extra compound stmts.
(build_vec_init): Likewise.
* name-lookup.c (maybe_push_cleanup_level): Use statement lists.
* name-lookup.h (struct cp_binding_level): Add statement_list.
* parser.c (cp_parser_statement): Take the STMT_EXPR node, not a bool.
(cp_parser_labeled_statement, cp_parser_expression_statement,
cp_parser_statement_seq_opt): Likewise.
(cp_parser_compound_statement): Likewise. Take bool for try block.
(cp_parser_selection_statement): Tidy if processing.
(cp_parser_already_scoped_statement): Rewrite to do what it says.
* pt.c (tsubst_copy): Move STMT_EXPR to tsubst_expr.
(tsubst_expr): Rewrite STMT_EXPR processing. Handle STATEMENT_LIST.
Mind COMPOUND_STMT_TRY_BLOCK, EXPR_STMT_STMT_EXPR_RESULT.
* semantics.c (do_poplevel, do_pushlevel): Use statement lists.
(finish_cond): New, rewritten from FINISH_COND.
(simplify_loop_decl_cond): New.
(finish_expr_stmt): Avoid nested EXPR_STMTs.
(begin_if_stmt, finish_if_stmt_cond, finish_then_clause,
begin_else_clause, finish_else_clause, finish_if_stmt,
begin_while_stmt, finish_while_stmt_cond, finish_while_stmt,
begin_do_stmt, finish_do_body, begin_for_stmt, finish_for_init_stmt,
finish_for_cond, finish_for_stmt, begin_switch_stmt,
finish_switch_cond, finish_switch_stmt, begin_try_block,
finish_try_block, finish_cleanup_try_block, finish_function_try_block,
finish_handler_sequence, finish_function_handler_sequence,
begin_handler, finish_handler_parms, finish_handler,
begin_stmt_expr, finish_stmt_expr_expr, finish_stmt_expr): Rewrite
using statement lists.
(begin_compound_stmt): Replace has_no_scope argument with flags.
Update all callers. Use statement lists.
(finish_compound_stmt): Likewise.
(finish_decl_cleanup, finish_eh_cleanup): Use push_cleanup.
(current_scope_stmt_stack): Remove.
(simplify_aggr_init_expr): Don't muck with TREE_CHAIN.
* typeck2.c (split_nonconstant_init_1, split_nonconstant_init):
Rewrite with statement lists.
testsuite/
* g++.dg/ext/stmtexpr1.C: XFAIL.
* gcc.dg/20030612-1.c: XFAIL.
From-SVN: r83221
2004-06-16 03:21:38 +02:00
|
|
|
|
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
stmt = build3 (COND_EXPR, NULL_TREE, cond, then_block, else_block);
|
2004-06-30 20:11:14 +02:00
|
|
|
|
SET_EXPR_LOCATION (stmt, if_locus);
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
add_stmt (stmt);
|
c-common.c (lang_gimplify_stmt): Remove next_p argument.
* c-common.c (lang_gimplify_stmt): Remove next_p argument.
(if_elt, if_stack, if_stack_space, c_expand_start_cond, c_finish_then,
c_expand_end_cond, c_expand_start_else, c_finish_else, c_begin_if_stmt,
c_begin_while_stmt, c_finish_while_stmt_cond): Move to c-typeck.c.
(finish_fname_decls, fname_decl): Use statement_lists.
(c_expand_expr_stmt): Don't set last_expr_type.
(c_type_hash): Fix indentation.
(c_safe_from_p): Don't follow TREE_CHAIN.
(c_tree_chain_matters_p): Remove.
* c-common.def (SCOPE_STMT): Remove.
(CLEANUP_STMT): Redefine to contain its own body.
* c-common.h (struct stmt_tree_s): Remove x_last_stmt,
x_last_expr_type, x_last_expr_filename, x_scope_stmt_stack.
Add x_cur_stmt_list.
(last_tree, last_expr_type, last_expr_filename, RECHAIN_STMTS): Remove.
(cur_stmt_list): New.
(STATEMENT_LIST_STMT_EXPR): New.
(SCOPE_BEGIN_P, SCOPE_END_P, SCOPE_STMT_BLOCK, SCOPE_NULLIFIED_P,
SCOPE_NO_CLEANUPS_P, SCOPE_PARTIAL_P, NEW_FOR_SCOPE_P): Remove.
(CLEANUP_BODY): New.
(CLEANUP_DECL): Move to operand 2.
(c_common_stmt_codes): Remove SCOPE_STMT.
(COMPOUND_STMT_NO_SCOPE, COMPOUND_STMT_BODY_BLOCK): Remove.
* c-decl.c (c_scope_stmt_stack, current_scope_stmt_stack): Remove.
(c_push_function_context, c_pop_function_context): Don't save it.
(finish_decl): Set TREE_USED on the decl for a cleanup.
Use push_cleanup.
(store_parm_decls): Use statement lists.
(finish_function): Remove compstmt rule workaround. Use statement
lists. Call finish_fname_decls after finalizing the body.
(c_begin_compound_stmt): Move to c-typeck.c.
* c-dump.c (c_dump_tree): Remove SCOPE_STMT.
* c-gimplify.c (gimplify_cleanup_stmt, gimplify_cleanup_stmts): New.
(c_genericize): Invoke them.
(c_gimplify_stmt): Don't look through TREE_CHAIN. Kill SCOPE_STMT.
(c_build_bind_expr): Export.
(gimplify_block, gimplify_cleanup): Remove.
(gimplify_condition): Use gimplify_stmt.
(gimplify_for_stmt): Remove FOR_INIT_STMT chaining hack.
(gimplify_if_stmt): Remove recursion hack.
(c_gimplify_expr): Remove STMT_EXPR handling.
(stmt_expr_last_stmt, gimplify_stmt_expr): Remove.
(is_last_stmt_of_scope): Remove.
* c-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
* c-mudflap.c (mflang_flush_calls): Use c_begin_compound_stmt,
c_end_compound_stmt.
* c-objc-common.c (build_cdtor): Likewise.
* c-parse.in (primary): Use c_finish_stmt_expr.
(push_scope, pop_scope): Remove.
(c99_block_start, compstmt_start): Use c_begin_compound_stmt.
(c99_block_end, compstmt): Use c_end_compound_stmt.
(c99_block_lineno_labeled_stmt): Likewise.
(compstmt_primary_start): Use c_begin_stmt_expr.
(simple_if, select_or_iter_stmt): Update calls to stmt builders.
(do_stmt_start): Fill in body directly.
(lineno_stmt): Avoid setting lineno on constants.
* c-pretty-print.c (pp_c_statement): Handle STATEMENT_LIST.
Remove SCOPE_STMT.
* c-semantics.c (begin_stmt_tree): Remove.
(push_stmt_list, re_push_stmt_list, pop_stmt_list): New.
(add_stmt): Use statement lists.
(add_scope_stmt, finish_stmt_tree): Remove.
(push_cleanup): New.
* c-tree.h: Move some decls from c-common.h.
* c-typeck.c (c_tree_expr_nonnegative_p): Simplify for statement lists.
(do_case, c_finish_case): Likewise.
(c_finish_then): Take body for then as argument.
(c_finish_else): Similarly.
(c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): New.
(c_begin_stmt_expr, c_finish_stmt_expr): New.
(c_begin_compound_stmt): Do scope management.
(c_end_compound_stmt): New.
* fold-const.c (tree_expr_nonnegative_p): Fix BIND_EXPR.
* gimplify.c (voidify_wrapper_expr): Accept temporary argument.
Look through exception handling constructs.
(gimplify_bind_expr): Accept temporary argument.
(gimplify_target_expr): Special case BIND_EXPR bodies.
(gimplify_expr): Handle fallback == fb_none like a statement.
* langhooks-def.h (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Kill.
* langhooks.c (lhd_tree_inlining_tree_chain_matters_p): Remove.
* langhooks.h (tree_chain_matters_p): Remove.
* stub-objc.c (objc_clear_super_receiver): New.
* tree-gimple.h (voidify_wrapper_expr): Update decl.
(append_to_statement_list, append_to_statement_list_force): Move
to tree-iterator.h.
* tree-inline.c (expand_call_inline): Update call.
(clone_body): Use statement lists.
(walk_tree): Don't check tree_chain_matters_p.
(copy_tree_r): Likewise.
* tree-iterator.c (alloc_stmt_list): Clear lang bits.
(tsi_link_before, tsi_link_after): Set TREE_SIDE_EFFECTS properly.
* tree-iterator.h (append_to_statement_list,
append_to_statement_list_force): Moved from tree-gimple.h.
* tree-pretty-print.c (dump_generic_node): Clean up TARGET_EXPR dump.
* objc/objc-act.c (build_module_descriptor): Use c_begin_compound_stmt.
(objc_enter_block): Likewise.
(objc_exit_block): Use c_end_compound_stmt.
(objc_build_try_enter_fragment): Add #error and comment for
rewriting for OBJCPLUS.
(objc_build_extract_fragment, objc_build_try_epilogue,
objc_build_catch_stmt, objc_build_finally_prologue,
objc_build_finally_epilogue): Update for C statement builders.
* objc/objc-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P):
Remove.
cp/
* call.c (initialize_reference): Don't build CLEANUP_STMT here.
* cp-gimplify.c (cp_gimplify_stmt): Remove next_p argument.
(genericize_try_block): Use gimplify_stmt.
(genericize_catch_block, genericize_eh_spec_block): Likewise.
(cp_gimplify_init_expr): Remove STMT_EXPR special case.
(gimplify_must_not_throw_expr): Update voidify_wrapper_expr call.
* cp-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
(cp_tree_chain_matters_p): Remove.
* cp-tree.h (COMPOUND_STMT_TRY_BLOCK): New.
(COMPOUND_STMT_BODY_BLOCK): New.
(STATEMENT_LIST_NO_SCOPE, STATEMENT_LIST_TRY_BLOCK): New.
(EXPR_STMT_STMT_EXPR_RESULT): New.
(building_stmt_tree): Check cur_stmt_list.
(tf_stmt_expr_cmpd, tf_stmt_expr_body): Remove.
(BCS_NO_SCOPE, BCS_TRY_BLOCK, BCS_FN_BODY): New.
* decl.c (poplevel): Use pop_stmt_list for minding cleanups.
(cp_finish_decl): Use push_cleanup.
(start_function, finish_function): Use statement lists.
(finish_stmt): Do nothing.
* except.c (begin_eh_spec_block): Use statement lists.
(check_handlers_1, check_handlers): Likewise.
* init.c (construct_virtual_base): Don't add extra compound stmts.
(build_vec_init): Likewise.
* name-lookup.c (maybe_push_cleanup_level): Use statement lists.
* name-lookup.h (struct cp_binding_level): Add statement_list.
* parser.c (cp_parser_statement): Take the STMT_EXPR node, not a bool.
(cp_parser_labeled_statement, cp_parser_expression_statement,
cp_parser_statement_seq_opt): Likewise.
(cp_parser_compound_statement): Likewise. Take bool for try block.
(cp_parser_selection_statement): Tidy if processing.
(cp_parser_already_scoped_statement): Rewrite to do what it says.
* pt.c (tsubst_copy): Move STMT_EXPR to tsubst_expr.
(tsubst_expr): Rewrite STMT_EXPR processing. Handle STATEMENT_LIST.
Mind COMPOUND_STMT_TRY_BLOCK, EXPR_STMT_STMT_EXPR_RESULT.
* semantics.c (do_poplevel, do_pushlevel): Use statement lists.
(finish_cond): New, rewritten from FINISH_COND.
(simplify_loop_decl_cond): New.
(finish_expr_stmt): Avoid nested EXPR_STMTs.
(begin_if_stmt, finish_if_stmt_cond, finish_then_clause,
begin_else_clause, finish_else_clause, finish_if_stmt,
begin_while_stmt, finish_while_stmt_cond, finish_while_stmt,
begin_do_stmt, finish_do_body, begin_for_stmt, finish_for_init_stmt,
finish_for_cond, finish_for_stmt, begin_switch_stmt,
finish_switch_cond, finish_switch_stmt, begin_try_block,
finish_try_block, finish_cleanup_try_block, finish_function_try_block,
finish_handler_sequence, finish_function_handler_sequence,
begin_handler, finish_handler_parms, finish_handler,
begin_stmt_expr, finish_stmt_expr_expr, finish_stmt_expr): Rewrite
using statement lists.
(begin_compound_stmt): Replace has_no_scope argument with flags.
Update all callers. Use statement lists.
(finish_compound_stmt): Likewise.
(finish_decl_cleanup, finish_eh_cleanup): Use push_cleanup.
(current_scope_stmt_stack): Remove.
(simplify_aggr_init_expr): Don't muck with TREE_CHAIN.
* typeck2.c (split_nonconstant_init_1, split_nonconstant_init):
Rewrite with statement lists.
testsuite/
* g++.dg/ext/stmtexpr1.C: XFAIL.
* gcc.dg/20030612-1.c: XFAIL.
From-SVN: r83221
2004-06-16 03:21:38 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
/* Emit a general-purpose loop construct. START_LOCUS is the location of
|
|
|
|
|
|
the beginning of the loop. COND is the loop condition. COND_IS_FIRST
|
|
|
|
|
|
is false for DO loops. INCR is the FOR increment expression. BODY is
|
c-typeck.c, [...]: Fix comment typos.
* c-typeck.c, cfgexpand.c, ddg.c, ddg.h, df.c, fold-const.c,
gcov.c, gimplify.c, modulo-sched.c, passes.c, tree-cfg.c,
tree-mudflap.c, tree-nrv.c, tree-outof-ssa.c, tree-ssa-dom.c,
tree-ssa-dse.c, tree-ssa-operands.c, tree-ssa-pre.c,
tree-tailcall.c: Fix comment typos. Follow spelling
conventions.
From-SVN: r83703
2004-06-26 07:03:55 +02:00
|
|
|
|
the statement controlled by the loop. BLAB is the break label. CLAB is
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
the continue label. Everything is allowed to be NULL. */
|
c-common.c (lang_gimplify_stmt): Remove next_p argument.
* c-common.c (lang_gimplify_stmt): Remove next_p argument.
(if_elt, if_stack, if_stack_space, c_expand_start_cond, c_finish_then,
c_expand_end_cond, c_expand_start_else, c_finish_else, c_begin_if_stmt,
c_begin_while_stmt, c_finish_while_stmt_cond): Move to c-typeck.c.
(finish_fname_decls, fname_decl): Use statement_lists.
(c_expand_expr_stmt): Don't set last_expr_type.
(c_type_hash): Fix indentation.
(c_safe_from_p): Don't follow TREE_CHAIN.
(c_tree_chain_matters_p): Remove.
* c-common.def (SCOPE_STMT): Remove.
(CLEANUP_STMT): Redefine to contain its own body.
* c-common.h (struct stmt_tree_s): Remove x_last_stmt,
x_last_expr_type, x_last_expr_filename, x_scope_stmt_stack.
Add x_cur_stmt_list.
(last_tree, last_expr_type, last_expr_filename, RECHAIN_STMTS): Remove.
(cur_stmt_list): New.
(STATEMENT_LIST_STMT_EXPR): New.
(SCOPE_BEGIN_P, SCOPE_END_P, SCOPE_STMT_BLOCK, SCOPE_NULLIFIED_P,
SCOPE_NO_CLEANUPS_P, SCOPE_PARTIAL_P, NEW_FOR_SCOPE_P): Remove.
(CLEANUP_BODY): New.
(CLEANUP_DECL): Move to operand 2.
(c_common_stmt_codes): Remove SCOPE_STMT.
(COMPOUND_STMT_NO_SCOPE, COMPOUND_STMT_BODY_BLOCK): Remove.
* c-decl.c (c_scope_stmt_stack, current_scope_stmt_stack): Remove.
(c_push_function_context, c_pop_function_context): Don't save it.
(finish_decl): Set TREE_USED on the decl for a cleanup.
Use push_cleanup.
(store_parm_decls): Use statement lists.
(finish_function): Remove compstmt rule workaround. Use statement
lists. Call finish_fname_decls after finalizing the body.
(c_begin_compound_stmt): Move to c-typeck.c.
* c-dump.c (c_dump_tree): Remove SCOPE_STMT.
* c-gimplify.c (gimplify_cleanup_stmt, gimplify_cleanup_stmts): New.
(c_genericize): Invoke them.
(c_gimplify_stmt): Don't look through TREE_CHAIN. Kill SCOPE_STMT.
(c_build_bind_expr): Export.
(gimplify_block, gimplify_cleanup): Remove.
(gimplify_condition): Use gimplify_stmt.
(gimplify_for_stmt): Remove FOR_INIT_STMT chaining hack.
(gimplify_if_stmt): Remove recursion hack.
(c_gimplify_expr): Remove STMT_EXPR handling.
(stmt_expr_last_stmt, gimplify_stmt_expr): Remove.
(is_last_stmt_of_scope): Remove.
* c-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
* c-mudflap.c (mflang_flush_calls): Use c_begin_compound_stmt,
c_end_compound_stmt.
* c-objc-common.c (build_cdtor): Likewise.
* c-parse.in (primary): Use c_finish_stmt_expr.
(push_scope, pop_scope): Remove.
(c99_block_start, compstmt_start): Use c_begin_compound_stmt.
(c99_block_end, compstmt): Use c_end_compound_stmt.
(c99_block_lineno_labeled_stmt): Likewise.
(compstmt_primary_start): Use c_begin_stmt_expr.
(simple_if, select_or_iter_stmt): Update calls to stmt builders.
(do_stmt_start): Fill in body directly.
(lineno_stmt): Avoid setting lineno on constants.
* c-pretty-print.c (pp_c_statement): Handle STATEMENT_LIST.
Remove SCOPE_STMT.
* c-semantics.c (begin_stmt_tree): Remove.
(push_stmt_list, re_push_stmt_list, pop_stmt_list): New.
(add_stmt): Use statement lists.
(add_scope_stmt, finish_stmt_tree): Remove.
(push_cleanup): New.
* c-tree.h: Move some decls from c-common.h.
* c-typeck.c (c_tree_expr_nonnegative_p): Simplify for statement lists.
(do_case, c_finish_case): Likewise.
(c_finish_then): Take body for then as argument.
(c_finish_else): Similarly.
(c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): New.
(c_begin_stmt_expr, c_finish_stmt_expr): New.
(c_begin_compound_stmt): Do scope management.
(c_end_compound_stmt): New.
* fold-const.c (tree_expr_nonnegative_p): Fix BIND_EXPR.
* gimplify.c (voidify_wrapper_expr): Accept temporary argument.
Look through exception handling constructs.
(gimplify_bind_expr): Accept temporary argument.
(gimplify_target_expr): Special case BIND_EXPR bodies.
(gimplify_expr): Handle fallback == fb_none like a statement.
* langhooks-def.h (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Kill.
* langhooks.c (lhd_tree_inlining_tree_chain_matters_p): Remove.
* langhooks.h (tree_chain_matters_p): Remove.
* stub-objc.c (objc_clear_super_receiver): New.
* tree-gimple.h (voidify_wrapper_expr): Update decl.
(append_to_statement_list, append_to_statement_list_force): Move
to tree-iterator.h.
* tree-inline.c (expand_call_inline): Update call.
(clone_body): Use statement lists.
(walk_tree): Don't check tree_chain_matters_p.
(copy_tree_r): Likewise.
* tree-iterator.c (alloc_stmt_list): Clear lang bits.
(tsi_link_before, tsi_link_after): Set TREE_SIDE_EFFECTS properly.
* tree-iterator.h (append_to_statement_list,
append_to_statement_list_force): Moved from tree-gimple.h.
* tree-pretty-print.c (dump_generic_node): Clean up TARGET_EXPR dump.
* objc/objc-act.c (build_module_descriptor): Use c_begin_compound_stmt.
(objc_enter_block): Likewise.
(objc_exit_block): Use c_end_compound_stmt.
(objc_build_try_enter_fragment): Add #error and comment for
rewriting for OBJCPLUS.
(objc_build_extract_fragment, objc_build_try_epilogue,
objc_build_catch_stmt, objc_build_finally_prologue,
objc_build_finally_epilogue): Update for C statement builders.
* objc/objc-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P):
Remove.
cp/
* call.c (initialize_reference): Don't build CLEANUP_STMT here.
* cp-gimplify.c (cp_gimplify_stmt): Remove next_p argument.
(genericize_try_block): Use gimplify_stmt.
(genericize_catch_block, genericize_eh_spec_block): Likewise.
(cp_gimplify_init_expr): Remove STMT_EXPR special case.
(gimplify_must_not_throw_expr): Update voidify_wrapper_expr call.
* cp-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
(cp_tree_chain_matters_p): Remove.
* cp-tree.h (COMPOUND_STMT_TRY_BLOCK): New.
(COMPOUND_STMT_BODY_BLOCK): New.
(STATEMENT_LIST_NO_SCOPE, STATEMENT_LIST_TRY_BLOCK): New.
(EXPR_STMT_STMT_EXPR_RESULT): New.
(building_stmt_tree): Check cur_stmt_list.
(tf_stmt_expr_cmpd, tf_stmt_expr_body): Remove.
(BCS_NO_SCOPE, BCS_TRY_BLOCK, BCS_FN_BODY): New.
* decl.c (poplevel): Use pop_stmt_list for minding cleanups.
(cp_finish_decl): Use push_cleanup.
(start_function, finish_function): Use statement lists.
(finish_stmt): Do nothing.
* except.c (begin_eh_spec_block): Use statement lists.
(check_handlers_1, check_handlers): Likewise.
* init.c (construct_virtual_base): Don't add extra compound stmts.
(build_vec_init): Likewise.
* name-lookup.c (maybe_push_cleanup_level): Use statement lists.
* name-lookup.h (struct cp_binding_level): Add statement_list.
* parser.c (cp_parser_statement): Take the STMT_EXPR node, not a bool.
(cp_parser_labeled_statement, cp_parser_expression_statement,
cp_parser_statement_seq_opt): Likewise.
(cp_parser_compound_statement): Likewise. Take bool for try block.
(cp_parser_selection_statement): Tidy if processing.
(cp_parser_already_scoped_statement): Rewrite to do what it says.
* pt.c (tsubst_copy): Move STMT_EXPR to tsubst_expr.
(tsubst_expr): Rewrite STMT_EXPR processing. Handle STATEMENT_LIST.
Mind COMPOUND_STMT_TRY_BLOCK, EXPR_STMT_STMT_EXPR_RESULT.
* semantics.c (do_poplevel, do_pushlevel): Use statement lists.
(finish_cond): New, rewritten from FINISH_COND.
(simplify_loop_decl_cond): New.
(finish_expr_stmt): Avoid nested EXPR_STMTs.
(begin_if_stmt, finish_if_stmt_cond, finish_then_clause,
begin_else_clause, finish_else_clause, finish_if_stmt,
begin_while_stmt, finish_while_stmt_cond, finish_while_stmt,
begin_do_stmt, finish_do_body, begin_for_stmt, finish_for_init_stmt,
finish_for_cond, finish_for_stmt, begin_switch_stmt,
finish_switch_cond, finish_switch_stmt, begin_try_block,
finish_try_block, finish_cleanup_try_block, finish_function_try_block,
finish_handler_sequence, finish_function_handler_sequence,
begin_handler, finish_handler_parms, finish_handler,
begin_stmt_expr, finish_stmt_expr_expr, finish_stmt_expr): Rewrite
using statement lists.
(begin_compound_stmt): Replace has_no_scope argument with flags.
Update all callers. Use statement lists.
(finish_compound_stmt): Likewise.
(finish_decl_cleanup, finish_eh_cleanup): Use push_cleanup.
(current_scope_stmt_stack): Remove.
(simplify_aggr_init_expr): Don't muck with TREE_CHAIN.
* typeck2.c (split_nonconstant_init_1, split_nonconstant_init):
Rewrite with statement lists.
testsuite/
* g++.dg/ext/stmtexpr1.C: XFAIL.
* gcc.dg/20030612-1.c: XFAIL.
From-SVN: r83221
2004-06-16 03:21:38 +02:00
|
|
|
|
|
|
|
|
|
|
void
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
c_finish_loop (location_t start_locus, tree cond, tree incr, tree body,
|
|
|
|
|
|
tree blab, tree clab, bool cond_is_first)
|
c-common.c (lang_gimplify_stmt): Remove next_p argument.
* c-common.c (lang_gimplify_stmt): Remove next_p argument.
(if_elt, if_stack, if_stack_space, c_expand_start_cond, c_finish_then,
c_expand_end_cond, c_expand_start_else, c_finish_else, c_begin_if_stmt,
c_begin_while_stmt, c_finish_while_stmt_cond): Move to c-typeck.c.
(finish_fname_decls, fname_decl): Use statement_lists.
(c_expand_expr_stmt): Don't set last_expr_type.
(c_type_hash): Fix indentation.
(c_safe_from_p): Don't follow TREE_CHAIN.
(c_tree_chain_matters_p): Remove.
* c-common.def (SCOPE_STMT): Remove.
(CLEANUP_STMT): Redefine to contain its own body.
* c-common.h (struct stmt_tree_s): Remove x_last_stmt,
x_last_expr_type, x_last_expr_filename, x_scope_stmt_stack.
Add x_cur_stmt_list.
(last_tree, last_expr_type, last_expr_filename, RECHAIN_STMTS): Remove.
(cur_stmt_list): New.
(STATEMENT_LIST_STMT_EXPR): New.
(SCOPE_BEGIN_P, SCOPE_END_P, SCOPE_STMT_BLOCK, SCOPE_NULLIFIED_P,
SCOPE_NO_CLEANUPS_P, SCOPE_PARTIAL_P, NEW_FOR_SCOPE_P): Remove.
(CLEANUP_BODY): New.
(CLEANUP_DECL): Move to operand 2.
(c_common_stmt_codes): Remove SCOPE_STMT.
(COMPOUND_STMT_NO_SCOPE, COMPOUND_STMT_BODY_BLOCK): Remove.
* c-decl.c (c_scope_stmt_stack, current_scope_stmt_stack): Remove.
(c_push_function_context, c_pop_function_context): Don't save it.
(finish_decl): Set TREE_USED on the decl for a cleanup.
Use push_cleanup.
(store_parm_decls): Use statement lists.
(finish_function): Remove compstmt rule workaround. Use statement
lists. Call finish_fname_decls after finalizing the body.
(c_begin_compound_stmt): Move to c-typeck.c.
* c-dump.c (c_dump_tree): Remove SCOPE_STMT.
* c-gimplify.c (gimplify_cleanup_stmt, gimplify_cleanup_stmts): New.
(c_genericize): Invoke them.
(c_gimplify_stmt): Don't look through TREE_CHAIN. Kill SCOPE_STMT.
(c_build_bind_expr): Export.
(gimplify_block, gimplify_cleanup): Remove.
(gimplify_condition): Use gimplify_stmt.
(gimplify_for_stmt): Remove FOR_INIT_STMT chaining hack.
(gimplify_if_stmt): Remove recursion hack.
(c_gimplify_expr): Remove STMT_EXPR handling.
(stmt_expr_last_stmt, gimplify_stmt_expr): Remove.
(is_last_stmt_of_scope): Remove.
* c-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
* c-mudflap.c (mflang_flush_calls): Use c_begin_compound_stmt,
c_end_compound_stmt.
* c-objc-common.c (build_cdtor): Likewise.
* c-parse.in (primary): Use c_finish_stmt_expr.
(push_scope, pop_scope): Remove.
(c99_block_start, compstmt_start): Use c_begin_compound_stmt.
(c99_block_end, compstmt): Use c_end_compound_stmt.
(c99_block_lineno_labeled_stmt): Likewise.
(compstmt_primary_start): Use c_begin_stmt_expr.
(simple_if, select_or_iter_stmt): Update calls to stmt builders.
(do_stmt_start): Fill in body directly.
(lineno_stmt): Avoid setting lineno on constants.
* c-pretty-print.c (pp_c_statement): Handle STATEMENT_LIST.
Remove SCOPE_STMT.
* c-semantics.c (begin_stmt_tree): Remove.
(push_stmt_list, re_push_stmt_list, pop_stmt_list): New.
(add_stmt): Use statement lists.
(add_scope_stmt, finish_stmt_tree): Remove.
(push_cleanup): New.
* c-tree.h: Move some decls from c-common.h.
* c-typeck.c (c_tree_expr_nonnegative_p): Simplify for statement lists.
(do_case, c_finish_case): Likewise.
(c_finish_then): Take body for then as argument.
(c_finish_else): Similarly.
(c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): New.
(c_begin_stmt_expr, c_finish_stmt_expr): New.
(c_begin_compound_stmt): Do scope management.
(c_end_compound_stmt): New.
* fold-const.c (tree_expr_nonnegative_p): Fix BIND_EXPR.
* gimplify.c (voidify_wrapper_expr): Accept temporary argument.
Look through exception handling constructs.
(gimplify_bind_expr): Accept temporary argument.
(gimplify_target_expr): Special case BIND_EXPR bodies.
(gimplify_expr): Handle fallback == fb_none like a statement.
* langhooks-def.h (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Kill.
* langhooks.c (lhd_tree_inlining_tree_chain_matters_p): Remove.
* langhooks.h (tree_chain_matters_p): Remove.
* stub-objc.c (objc_clear_super_receiver): New.
* tree-gimple.h (voidify_wrapper_expr): Update decl.
(append_to_statement_list, append_to_statement_list_force): Move
to tree-iterator.h.
* tree-inline.c (expand_call_inline): Update call.
(clone_body): Use statement lists.
(walk_tree): Don't check tree_chain_matters_p.
(copy_tree_r): Likewise.
* tree-iterator.c (alloc_stmt_list): Clear lang bits.
(tsi_link_before, tsi_link_after): Set TREE_SIDE_EFFECTS properly.
* tree-iterator.h (append_to_statement_list,
append_to_statement_list_force): Moved from tree-gimple.h.
* tree-pretty-print.c (dump_generic_node): Clean up TARGET_EXPR dump.
* objc/objc-act.c (build_module_descriptor): Use c_begin_compound_stmt.
(objc_enter_block): Likewise.
(objc_exit_block): Use c_end_compound_stmt.
(objc_build_try_enter_fragment): Add #error and comment for
rewriting for OBJCPLUS.
(objc_build_extract_fragment, objc_build_try_epilogue,
objc_build_catch_stmt, objc_build_finally_prologue,
objc_build_finally_epilogue): Update for C statement builders.
* objc/objc-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P):
Remove.
cp/
* call.c (initialize_reference): Don't build CLEANUP_STMT here.
* cp-gimplify.c (cp_gimplify_stmt): Remove next_p argument.
(genericize_try_block): Use gimplify_stmt.
(genericize_catch_block, genericize_eh_spec_block): Likewise.
(cp_gimplify_init_expr): Remove STMT_EXPR special case.
(gimplify_must_not_throw_expr): Update voidify_wrapper_expr call.
* cp-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
(cp_tree_chain_matters_p): Remove.
* cp-tree.h (COMPOUND_STMT_TRY_BLOCK): New.
(COMPOUND_STMT_BODY_BLOCK): New.
(STATEMENT_LIST_NO_SCOPE, STATEMENT_LIST_TRY_BLOCK): New.
(EXPR_STMT_STMT_EXPR_RESULT): New.
(building_stmt_tree): Check cur_stmt_list.
(tf_stmt_expr_cmpd, tf_stmt_expr_body): Remove.
(BCS_NO_SCOPE, BCS_TRY_BLOCK, BCS_FN_BODY): New.
* decl.c (poplevel): Use pop_stmt_list for minding cleanups.
(cp_finish_decl): Use push_cleanup.
(start_function, finish_function): Use statement lists.
(finish_stmt): Do nothing.
* except.c (begin_eh_spec_block): Use statement lists.
(check_handlers_1, check_handlers): Likewise.
* init.c (construct_virtual_base): Don't add extra compound stmts.
(build_vec_init): Likewise.
* name-lookup.c (maybe_push_cleanup_level): Use statement lists.
* name-lookup.h (struct cp_binding_level): Add statement_list.
* parser.c (cp_parser_statement): Take the STMT_EXPR node, not a bool.
(cp_parser_labeled_statement, cp_parser_expression_statement,
cp_parser_statement_seq_opt): Likewise.
(cp_parser_compound_statement): Likewise. Take bool for try block.
(cp_parser_selection_statement): Tidy if processing.
(cp_parser_already_scoped_statement): Rewrite to do what it says.
* pt.c (tsubst_copy): Move STMT_EXPR to tsubst_expr.
(tsubst_expr): Rewrite STMT_EXPR processing. Handle STATEMENT_LIST.
Mind COMPOUND_STMT_TRY_BLOCK, EXPR_STMT_STMT_EXPR_RESULT.
* semantics.c (do_poplevel, do_pushlevel): Use statement lists.
(finish_cond): New, rewritten from FINISH_COND.
(simplify_loop_decl_cond): New.
(finish_expr_stmt): Avoid nested EXPR_STMTs.
(begin_if_stmt, finish_if_stmt_cond, finish_then_clause,
begin_else_clause, finish_else_clause, finish_if_stmt,
begin_while_stmt, finish_while_stmt_cond, finish_while_stmt,
begin_do_stmt, finish_do_body, begin_for_stmt, finish_for_init_stmt,
finish_for_cond, finish_for_stmt, begin_switch_stmt,
finish_switch_cond, finish_switch_stmt, begin_try_block,
finish_try_block, finish_cleanup_try_block, finish_function_try_block,
finish_handler_sequence, finish_function_handler_sequence,
begin_handler, finish_handler_parms, finish_handler,
begin_stmt_expr, finish_stmt_expr_expr, finish_stmt_expr): Rewrite
using statement lists.
(begin_compound_stmt): Replace has_no_scope argument with flags.
Update all callers. Use statement lists.
(finish_compound_stmt): Likewise.
(finish_decl_cleanup, finish_eh_cleanup): Use push_cleanup.
(current_scope_stmt_stack): Remove.
(simplify_aggr_init_expr): Don't muck with TREE_CHAIN.
* typeck2.c (split_nonconstant_init_1, split_nonconstant_init):
Rewrite with statement lists.
testsuite/
* g++.dg/ext/stmtexpr1.C: XFAIL.
* gcc.dg/20030612-1.c: XFAIL.
From-SVN: r83221
2004-06-16 03:21:38 +02:00
|
|
|
|
{
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
tree entry = NULL, exit = NULL, t;
|
|
|
|
|
|
|
|
|
|
|
|
/* Detect do { ... } while (0) and don't generate loop construct. */
|
2004-07-04 19:28:56 +02:00
|
|
|
|
if (cond && !cond_is_first && integer_zerop (cond))
|
|
|
|
|
|
cond = NULL;
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
if (cond_is_first || cond)
|
|
|
|
|
|
{
|
|
|
|
|
|
tree top = build1 (LABEL_EXPR, void_type_node, NULL_TREE);
|
|
|
|
|
|
|
|
|
|
|
|
/* If we have an exit condition, then we build an IF with gotos either
|
|
|
|
|
|
out of the loop, or to the top of it. If there's no exit condition,
|
|
|
|
|
|
then we just build a jump back to the top. */
|
|
|
|
|
|
exit = build_and_jump (&LABEL_EXPR_LABEL (top));
|
|
|
|
|
|
|
|
|
|
|
|
if (cond)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Canonicalize the loop condition to the end. This means
|
|
|
|
|
|
generating a branch to the loop condition. Reuse the
|
|
|
|
|
|
continue label, if possible. */
|
|
|
|
|
|
if (cond_is_first)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (incr || !clab)
|
|
|
|
|
|
{
|
|
|
|
|
|
entry = build1 (LABEL_EXPR, void_type_node, NULL_TREE);
|
|
|
|
|
|
t = build_and_jump (&LABEL_EXPR_LABEL (entry));
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
t = build1 (GOTO_EXPR, void_type_node, clab);
|
2004-06-30 20:11:14 +02:00
|
|
|
|
SET_EXPR_LOCATION (t, start_locus);
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
add_stmt (t);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
t = build_and_jump (&blab);
|
|
|
|
|
|
exit = build (COND_EXPR, void_type_node, cond, exit, t);
|
|
|
|
|
|
exit = fold (exit);
|
|
|
|
|
|
if (cond_is_first)
|
2004-06-30 20:11:14 +02:00
|
|
|
|
SET_EXPR_LOCATION (exit, start_locus);
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
else
|
2004-06-30 20:11:14 +02:00
|
|
|
|
SET_EXPR_LOCATION (exit, input_location);
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
add_stmt (top);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (body)
|
|
|
|
|
|
add_stmt (body);
|
|
|
|
|
|
if (clab)
|
|
|
|
|
|
add_stmt (build1 (LABEL_EXPR, void_type_node, clab));
|
|
|
|
|
|
if (incr)
|
|
|
|
|
|
add_stmt (incr);
|
|
|
|
|
|
if (entry)
|
|
|
|
|
|
add_stmt (entry);
|
|
|
|
|
|
if (exit)
|
|
|
|
|
|
add_stmt (exit);
|
|
|
|
|
|
if (blab)
|
|
|
|
|
|
add_stmt (build1 (LABEL_EXPR, void_type_node, blab));
|
c-common.c (lang_gimplify_stmt): Remove next_p argument.
* c-common.c (lang_gimplify_stmt): Remove next_p argument.
(if_elt, if_stack, if_stack_space, c_expand_start_cond, c_finish_then,
c_expand_end_cond, c_expand_start_else, c_finish_else, c_begin_if_stmt,
c_begin_while_stmt, c_finish_while_stmt_cond): Move to c-typeck.c.
(finish_fname_decls, fname_decl): Use statement_lists.
(c_expand_expr_stmt): Don't set last_expr_type.
(c_type_hash): Fix indentation.
(c_safe_from_p): Don't follow TREE_CHAIN.
(c_tree_chain_matters_p): Remove.
* c-common.def (SCOPE_STMT): Remove.
(CLEANUP_STMT): Redefine to contain its own body.
* c-common.h (struct stmt_tree_s): Remove x_last_stmt,
x_last_expr_type, x_last_expr_filename, x_scope_stmt_stack.
Add x_cur_stmt_list.
(last_tree, last_expr_type, last_expr_filename, RECHAIN_STMTS): Remove.
(cur_stmt_list): New.
(STATEMENT_LIST_STMT_EXPR): New.
(SCOPE_BEGIN_P, SCOPE_END_P, SCOPE_STMT_BLOCK, SCOPE_NULLIFIED_P,
SCOPE_NO_CLEANUPS_P, SCOPE_PARTIAL_P, NEW_FOR_SCOPE_P): Remove.
(CLEANUP_BODY): New.
(CLEANUP_DECL): Move to operand 2.
(c_common_stmt_codes): Remove SCOPE_STMT.
(COMPOUND_STMT_NO_SCOPE, COMPOUND_STMT_BODY_BLOCK): Remove.
* c-decl.c (c_scope_stmt_stack, current_scope_stmt_stack): Remove.
(c_push_function_context, c_pop_function_context): Don't save it.
(finish_decl): Set TREE_USED on the decl for a cleanup.
Use push_cleanup.
(store_parm_decls): Use statement lists.
(finish_function): Remove compstmt rule workaround. Use statement
lists. Call finish_fname_decls after finalizing the body.
(c_begin_compound_stmt): Move to c-typeck.c.
* c-dump.c (c_dump_tree): Remove SCOPE_STMT.
* c-gimplify.c (gimplify_cleanup_stmt, gimplify_cleanup_stmts): New.
(c_genericize): Invoke them.
(c_gimplify_stmt): Don't look through TREE_CHAIN. Kill SCOPE_STMT.
(c_build_bind_expr): Export.
(gimplify_block, gimplify_cleanup): Remove.
(gimplify_condition): Use gimplify_stmt.
(gimplify_for_stmt): Remove FOR_INIT_STMT chaining hack.
(gimplify_if_stmt): Remove recursion hack.
(c_gimplify_expr): Remove STMT_EXPR handling.
(stmt_expr_last_stmt, gimplify_stmt_expr): Remove.
(is_last_stmt_of_scope): Remove.
* c-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
* c-mudflap.c (mflang_flush_calls): Use c_begin_compound_stmt,
c_end_compound_stmt.
* c-objc-common.c (build_cdtor): Likewise.
* c-parse.in (primary): Use c_finish_stmt_expr.
(push_scope, pop_scope): Remove.
(c99_block_start, compstmt_start): Use c_begin_compound_stmt.
(c99_block_end, compstmt): Use c_end_compound_stmt.
(c99_block_lineno_labeled_stmt): Likewise.
(compstmt_primary_start): Use c_begin_stmt_expr.
(simple_if, select_or_iter_stmt): Update calls to stmt builders.
(do_stmt_start): Fill in body directly.
(lineno_stmt): Avoid setting lineno on constants.
* c-pretty-print.c (pp_c_statement): Handle STATEMENT_LIST.
Remove SCOPE_STMT.
* c-semantics.c (begin_stmt_tree): Remove.
(push_stmt_list, re_push_stmt_list, pop_stmt_list): New.
(add_stmt): Use statement lists.
(add_scope_stmt, finish_stmt_tree): Remove.
(push_cleanup): New.
* c-tree.h: Move some decls from c-common.h.
* c-typeck.c (c_tree_expr_nonnegative_p): Simplify for statement lists.
(do_case, c_finish_case): Likewise.
(c_finish_then): Take body for then as argument.
(c_finish_else): Similarly.
(c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): New.
(c_begin_stmt_expr, c_finish_stmt_expr): New.
(c_begin_compound_stmt): Do scope management.
(c_end_compound_stmt): New.
* fold-const.c (tree_expr_nonnegative_p): Fix BIND_EXPR.
* gimplify.c (voidify_wrapper_expr): Accept temporary argument.
Look through exception handling constructs.
(gimplify_bind_expr): Accept temporary argument.
(gimplify_target_expr): Special case BIND_EXPR bodies.
(gimplify_expr): Handle fallback == fb_none like a statement.
* langhooks-def.h (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Kill.
* langhooks.c (lhd_tree_inlining_tree_chain_matters_p): Remove.
* langhooks.h (tree_chain_matters_p): Remove.
* stub-objc.c (objc_clear_super_receiver): New.
* tree-gimple.h (voidify_wrapper_expr): Update decl.
(append_to_statement_list, append_to_statement_list_force): Move
to tree-iterator.h.
* tree-inline.c (expand_call_inline): Update call.
(clone_body): Use statement lists.
(walk_tree): Don't check tree_chain_matters_p.
(copy_tree_r): Likewise.
* tree-iterator.c (alloc_stmt_list): Clear lang bits.
(tsi_link_before, tsi_link_after): Set TREE_SIDE_EFFECTS properly.
* tree-iterator.h (append_to_statement_list,
append_to_statement_list_force): Moved from tree-gimple.h.
* tree-pretty-print.c (dump_generic_node): Clean up TARGET_EXPR dump.
* objc/objc-act.c (build_module_descriptor): Use c_begin_compound_stmt.
(objc_enter_block): Likewise.
(objc_exit_block): Use c_end_compound_stmt.
(objc_build_try_enter_fragment): Add #error and comment for
rewriting for OBJCPLUS.
(objc_build_extract_fragment, objc_build_try_epilogue,
objc_build_catch_stmt, objc_build_finally_prologue,
objc_build_finally_epilogue): Update for C statement builders.
* objc/objc-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P):
Remove.
cp/
* call.c (initialize_reference): Don't build CLEANUP_STMT here.
* cp-gimplify.c (cp_gimplify_stmt): Remove next_p argument.
(genericize_try_block): Use gimplify_stmt.
(genericize_catch_block, genericize_eh_spec_block): Likewise.
(cp_gimplify_init_expr): Remove STMT_EXPR special case.
(gimplify_must_not_throw_expr): Update voidify_wrapper_expr call.
* cp-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
(cp_tree_chain_matters_p): Remove.
* cp-tree.h (COMPOUND_STMT_TRY_BLOCK): New.
(COMPOUND_STMT_BODY_BLOCK): New.
(STATEMENT_LIST_NO_SCOPE, STATEMENT_LIST_TRY_BLOCK): New.
(EXPR_STMT_STMT_EXPR_RESULT): New.
(building_stmt_tree): Check cur_stmt_list.
(tf_stmt_expr_cmpd, tf_stmt_expr_body): Remove.
(BCS_NO_SCOPE, BCS_TRY_BLOCK, BCS_FN_BODY): New.
* decl.c (poplevel): Use pop_stmt_list for minding cleanups.
(cp_finish_decl): Use push_cleanup.
(start_function, finish_function): Use statement lists.
(finish_stmt): Do nothing.
* except.c (begin_eh_spec_block): Use statement lists.
(check_handlers_1, check_handlers): Likewise.
* init.c (construct_virtual_base): Don't add extra compound stmts.
(build_vec_init): Likewise.
* name-lookup.c (maybe_push_cleanup_level): Use statement lists.
* name-lookup.h (struct cp_binding_level): Add statement_list.
* parser.c (cp_parser_statement): Take the STMT_EXPR node, not a bool.
(cp_parser_labeled_statement, cp_parser_expression_statement,
cp_parser_statement_seq_opt): Likewise.
(cp_parser_compound_statement): Likewise. Take bool for try block.
(cp_parser_selection_statement): Tidy if processing.
(cp_parser_already_scoped_statement): Rewrite to do what it says.
* pt.c (tsubst_copy): Move STMT_EXPR to tsubst_expr.
(tsubst_expr): Rewrite STMT_EXPR processing. Handle STATEMENT_LIST.
Mind COMPOUND_STMT_TRY_BLOCK, EXPR_STMT_STMT_EXPR_RESULT.
* semantics.c (do_poplevel, do_pushlevel): Use statement lists.
(finish_cond): New, rewritten from FINISH_COND.
(simplify_loop_decl_cond): New.
(finish_expr_stmt): Avoid nested EXPR_STMTs.
(begin_if_stmt, finish_if_stmt_cond, finish_then_clause,
begin_else_clause, finish_else_clause, finish_if_stmt,
begin_while_stmt, finish_while_stmt_cond, finish_while_stmt,
begin_do_stmt, finish_do_body, begin_for_stmt, finish_for_init_stmt,
finish_for_cond, finish_for_stmt, begin_switch_stmt,
finish_switch_cond, finish_switch_stmt, begin_try_block,
finish_try_block, finish_cleanup_try_block, finish_function_try_block,
finish_handler_sequence, finish_function_handler_sequence,
begin_handler, finish_handler_parms, finish_handler,
begin_stmt_expr, finish_stmt_expr_expr, finish_stmt_expr): Rewrite
using statement lists.
(begin_compound_stmt): Replace has_no_scope argument with flags.
Update all callers. Use statement lists.
(finish_compound_stmt): Likewise.
(finish_decl_cleanup, finish_eh_cleanup): Use push_cleanup.
(current_scope_stmt_stack): Remove.
(simplify_aggr_init_expr): Don't muck with TREE_CHAIN.
* typeck2.c (split_nonconstant_init_1, split_nonconstant_init):
Rewrite with statement lists.
testsuite/
* g++.dg/ext/stmtexpr1.C: XFAIL.
* gcc.dg/20030612-1.c: XFAIL.
From-SVN: r83221
2004-06-16 03:21:38 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
tree
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
c_finish_bc_stmt (tree *label_p, bool is_break)
|
c-common.c (lang_gimplify_stmt): Remove next_p argument.
* c-common.c (lang_gimplify_stmt): Remove next_p argument.
(if_elt, if_stack, if_stack_space, c_expand_start_cond, c_finish_then,
c_expand_end_cond, c_expand_start_else, c_finish_else, c_begin_if_stmt,
c_begin_while_stmt, c_finish_while_stmt_cond): Move to c-typeck.c.
(finish_fname_decls, fname_decl): Use statement_lists.
(c_expand_expr_stmt): Don't set last_expr_type.
(c_type_hash): Fix indentation.
(c_safe_from_p): Don't follow TREE_CHAIN.
(c_tree_chain_matters_p): Remove.
* c-common.def (SCOPE_STMT): Remove.
(CLEANUP_STMT): Redefine to contain its own body.
* c-common.h (struct stmt_tree_s): Remove x_last_stmt,
x_last_expr_type, x_last_expr_filename, x_scope_stmt_stack.
Add x_cur_stmt_list.
(last_tree, last_expr_type, last_expr_filename, RECHAIN_STMTS): Remove.
(cur_stmt_list): New.
(STATEMENT_LIST_STMT_EXPR): New.
(SCOPE_BEGIN_P, SCOPE_END_P, SCOPE_STMT_BLOCK, SCOPE_NULLIFIED_P,
SCOPE_NO_CLEANUPS_P, SCOPE_PARTIAL_P, NEW_FOR_SCOPE_P): Remove.
(CLEANUP_BODY): New.
(CLEANUP_DECL): Move to operand 2.
(c_common_stmt_codes): Remove SCOPE_STMT.
(COMPOUND_STMT_NO_SCOPE, COMPOUND_STMT_BODY_BLOCK): Remove.
* c-decl.c (c_scope_stmt_stack, current_scope_stmt_stack): Remove.
(c_push_function_context, c_pop_function_context): Don't save it.
(finish_decl): Set TREE_USED on the decl for a cleanup.
Use push_cleanup.
(store_parm_decls): Use statement lists.
(finish_function): Remove compstmt rule workaround. Use statement
lists. Call finish_fname_decls after finalizing the body.
(c_begin_compound_stmt): Move to c-typeck.c.
* c-dump.c (c_dump_tree): Remove SCOPE_STMT.
* c-gimplify.c (gimplify_cleanup_stmt, gimplify_cleanup_stmts): New.
(c_genericize): Invoke them.
(c_gimplify_stmt): Don't look through TREE_CHAIN. Kill SCOPE_STMT.
(c_build_bind_expr): Export.
(gimplify_block, gimplify_cleanup): Remove.
(gimplify_condition): Use gimplify_stmt.
(gimplify_for_stmt): Remove FOR_INIT_STMT chaining hack.
(gimplify_if_stmt): Remove recursion hack.
(c_gimplify_expr): Remove STMT_EXPR handling.
(stmt_expr_last_stmt, gimplify_stmt_expr): Remove.
(is_last_stmt_of_scope): Remove.
* c-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
* c-mudflap.c (mflang_flush_calls): Use c_begin_compound_stmt,
c_end_compound_stmt.
* c-objc-common.c (build_cdtor): Likewise.
* c-parse.in (primary): Use c_finish_stmt_expr.
(push_scope, pop_scope): Remove.
(c99_block_start, compstmt_start): Use c_begin_compound_stmt.
(c99_block_end, compstmt): Use c_end_compound_stmt.
(c99_block_lineno_labeled_stmt): Likewise.
(compstmt_primary_start): Use c_begin_stmt_expr.
(simple_if, select_or_iter_stmt): Update calls to stmt builders.
(do_stmt_start): Fill in body directly.
(lineno_stmt): Avoid setting lineno on constants.
* c-pretty-print.c (pp_c_statement): Handle STATEMENT_LIST.
Remove SCOPE_STMT.
* c-semantics.c (begin_stmt_tree): Remove.
(push_stmt_list, re_push_stmt_list, pop_stmt_list): New.
(add_stmt): Use statement lists.
(add_scope_stmt, finish_stmt_tree): Remove.
(push_cleanup): New.
* c-tree.h: Move some decls from c-common.h.
* c-typeck.c (c_tree_expr_nonnegative_p): Simplify for statement lists.
(do_case, c_finish_case): Likewise.
(c_finish_then): Take body for then as argument.
(c_finish_else): Similarly.
(c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): New.
(c_begin_stmt_expr, c_finish_stmt_expr): New.
(c_begin_compound_stmt): Do scope management.
(c_end_compound_stmt): New.
* fold-const.c (tree_expr_nonnegative_p): Fix BIND_EXPR.
* gimplify.c (voidify_wrapper_expr): Accept temporary argument.
Look through exception handling constructs.
(gimplify_bind_expr): Accept temporary argument.
(gimplify_target_expr): Special case BIND_EXPR bodies.
(gimplify_expr): Handle fallback == fb_none like a statement.
* langhooks-def.h (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Kill.
* langhooks.c (lhd_tree_inlining_tree_chain_matters_p): Remove.
* langhooks.h (tree_chain_matters_p): Remove.
* stub-objc.c (objc_clear_super_receiver): New.
* tree-gimple.h (voidify_wrapper_expr): Update decl.
(append_to_statement_list, append_to_statement_list_force): Move
to tree-iterator.h.
* tree-inline.c (expand_call_inline): Update call.
(clone_body): Use statement lists.
(walk_tree): Don't check tree_chain_matters_p.
(copy_tree_r): Likewise.
* tree-iterator.c (alloc_stmt_list): Clear lang bits.
(tsi_link_before, tsi_link_after): Set TREE_SIDE_EFFECTS properly.
* tree-iterator.h (append_to_statement_list,
append_to_statement_list_force): Moved from tree-gimple.h.
* tree-pretty-print.c (dump_generic_node): Clean up TARGET_EXPR dump.
* objc/objc-act.c (build_module_descriptor): Use c_begin_compound_stmt.
(objc_enter_block): Likewise.
(objc_exit_block): Use c_end_compound_stmt.
(objc_build_try_enter_fragment): Add #error and comment for
rewriting for OBJCPLUS.
(objc_build_extract_fragment, objc_build_try_epilogue,
objc_build_catch_stmt, objc_build_finally_prologue,
objc_build_finally_epilogue): Update for C statement builders.
* objc/objc-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P):
Remove.
cp/
* call.c (initialize_reference): Don't build CLEANUP_STMT here.
* cp-gimplify.c (cp_gimplify_stmt): Remove next_p argument.
(genericize_try_block): Use gimplify_stmt.
(genericize_catch_block, genericize_eh_spec_block): Likewise.
(cp_gimplify_init_expr): Remove STMT_EXPR special case.
(gimplify_must_not_throw_expr): Update voidify_wrapper_expr call.
* cp-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
(cp_tree_chain_matters_p): Remove.
* cp-tree.h (COMPOUND_STMT_TRY_BLOCK): New.
(COMPOUND_STMT_BODY_BLOCK): New.
(STATEMENT_LIST_NO_SCOPE, STATEMENT_LIST_TRY_BLOCK): New.
(EXPR_STMT_STMT_EXPR_RESULT): New.
(building_stmt_tree): Check cur_stmt_list.
(tf_stmt_expr_cmpd, tf_stmt_expr_body): Remove.
(BCS_NO_SCOPE, BCS_TRY_BLOCK, BCS_FN_BODY): New.
* decl.c (poplevel): Use pop_stmt_list for minding cleanups.
(cp_finish_decl): Use push_cleanup.
(start_function, finish_function): Use statement lists.
(finish_stmt): Do nothing.
* except.c (begin_eh_spec_block): Use statement lists.
(check_handlers_1, check_handlers): Likewise.
* init.c (construct_virtual_base): Don't add extra compound stmts.
(build_vec_init): Likewise.
* name-lookup.c (maybe_push_cleanup_level): Use statement lists.
* name-lookup.h (struct cp_binding_level): Add statement_list.
* parser.c (cp_parser_statement): Take the STMT_EXPR node, not a bool.
(cp_parser_labeled_statement, cp_parser_expression_statement,
cp_parser_statement_seq_opt): Likewise.
(cp_parser_compound_statement): Likewise. Take bool for try block.
(cp_parser_selection_statement): Tidy if processing.
(cp_parser_already_scoped_statement): Rewrite to do what it says.
* pt.c (tsubst_copy): Move STMT_EXPR to tsubst_expr.
(tsubst_expr): Rewrite STMT_EXPR processing. Handle STATEMENT_LIST.
Mind COMPOUND_STMT_TRY_BLOCK, EXPR_STMT_STMT_EXPR_RESULT.
* semantics.c (do_poplevel, do_pushlevel): Use statement lists.
(finish_cond): New, rewritten from FINISH_COND.
(simplify_loop_decl_cond): New.
(finish_expr_stmt): Avoid nested EXPR_STMTs.
(begin_if_stmt, finish_if_stmt_cond, finish_then_clause,
begin_else_clause, finish_else_clause, finish_if_stmt,
begin_while_stmt, finish_while_stmt_cond, finish_while_stmt,
begin_do_stmt, finish_do_body, begin_for_stmt, finish_for_init_stmt,
finish_for_cond, finish_for_stmt, begin_switch_stmt,
finish_switch_cond, finish_switch_stmt, begin_try_block,
finish_try_block, finish_cleanup_try_block, finish_function_try_block,
finish_handler_sequence, finish_function_handler_sequence,
begin_handler, finish_handler_parms, finish_handler,
begin_stmt_expr, finish_stmt_expr_expr, finish_stmt_expr): Rewrite
using statement lists.
(begin_compound_stmt): Replace has_no_scope argument with flags.
Update all callers. Use statement lists.
(finish_compound_stmt): Likewise.
(finish_decl_cleanup, finish_eh_cleanup): Use push_cleanup.
(current_scope_stmt_stack): Remove.
(simplify_aggr_init_expr): Don't muck with TREE_CHAIN.
* typeck2.c (split_nonconstant_init_1, split_nonconstant_init):
Rewrite with statement lists.
testsuite/
* g++.dg/ext/stmtexpr1.C: XFAIL.
* gcc.dg/20030612-1.c: XFAIL.
From-SVN: r83221
2004-06-16 03:21:38 +02:00
|
|
|
|
{
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
tree label = *label_p;
|
c-common.c (lang_gimplify_stmt): Remove next_p argument.
* c-common.c (lang_gimplify_stmt): Remove next_p argument.
(if_elt, if_stack, if_stack_space, c_expand_start_cond, c_finish_then,
c_expand_end_cond, c_expand_start_else, c_finish_else, c_begin_if_stmt,
c_begin_while_stmt, c_finish_while_stmt_cond): Move to c-typeck.c.
(finish_fname_decls, fname_decl): Use statement_lists.
(c_expand_expr_stmt): Don't set last_expr_type.
(c_type_hash): Fix indentation.
(c_safe_from_p): Don't follow TREE_CHAIN.
(c_tree_chain_matters_p): Remove.
* c-common.def (SCOPE_STMT): Remove.
(CLEANUP_STMT): Redefine to contain its own body.
* c-common.h (struct stmt_tree_s): Remove x_last_stmt,
x_last_expr_type, x_last_expr_filename, x_scope_stmt_stack.
Add x_cur_stmt_list.
(last_tree, last_expr_type, last_expr_filename, RECHAIN_STMTS): Remove.
(cur_stmt_list): New.
(STATEMENT_LIST_STMT_EXPR): New.
(SCOPE_BEGIN_P, SCOPE_END_P, SCOPE_STMT_BLOCK, SCOPE_NULLIFIED_P,
SCOPE_NO_CLEANUPS_P, SCOPE_PARTIAL_P, NEW_FOR_SCOPE_P): Remove.
(CLEANUP_BODY): New.
(CLEANUP_DECL): Move to operand 2.
(c_common_stmt_codes): Remove SCOPE_STMT.
(COMPOUND_STMT_NO_SCOPE, COMPOUND_STMT_BODY_BLOCK): Remove.
* c-decl.c (c_scope_stmt_stack, current_scope_stmt_stack): Remove.
(c_push_function_context, c_pop_function_context): Don't save it.
(finish_decl): Set TREE_USED on the decl for a cleanup.
Use push_cleanup.
(store_parm_decls): Use statement lists.
(finish_function): Remove compstmt rule workaround. Use statement
lists. Call finish_fname_decls after finalizing the body.
(c_begin_compound_stmt): Move to c-typeck.c.
* c-dump.c (c_dump_tree): Remove SCOPE_STMT.
* c-gimplify.c (gimplify_cleanup_stmt, gimplify_cleanup_stmts): New.
(c_genericize): Invoke them.
(c_gimplify_stmt): Don't look through TREE_CHAIN. Kill SCOPE_STMT.
(c_build_bind_expr): Export.
(gimplify_block, gimplify_cleanup): Remove.
(gimplify_condition): Use gimplify_stmt.
(gimplify_for_stmt): Remove FOR_INIT_STMT chaining hack.
(gimplify_if_stmt): Remove recursion hack.
(c_gimplify_expr): Remove STMT_EXPR handling.
(stmt_expr_last_stmt, gimplify_stmt_expr): Remove.
(is_last_stmt_of_scope): Remove.
* c-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
* c-mudflap.c (mflang_flush_calls): Use c_begin_compound_stmt,
c_end_compound_stmt.
* c-objc-common.c (build_cdtor): Likewise.
* c-parse.in (primary): Use c_finish_stmt_expr.
(push_scope, pop_scope): Remove.
(c99_block_start, compstmt_start): Use c_begin_compound_stmt.
(c99_block_end, compstmt): Use c_end_compound_stmt.
(c99_block_lineno_labeled_stmt): Likewise.
(compstmt_primary_start): Use c_begin_stmt_expr.
(simple_if, select_or_iter_stmt): Update calls to stmt builders.
(do_stmt_start): Fill in body directly.
(lineno_stmt): Avoid setting lineno on constants.
* c-pretty-print.c (pp_c_statement): Handle STATEMENT_LIST.
Remove SCOPE_STMT.
* c-semantics.c (begin_stmt_tree): Remove.
(push_stmt_list, re_push_stmt_list, pop_stmt_list): New.
(add_stmt): Use statement lists.
(add_scope_stmt, finish_stmt_tree): Remove.
(push_cleanup): New.
* c-tree.h: Move some decls from c-common.h.
* c-typeck.c (c_tree_expr_nonnegative_p): Simplify for statement lists.
(do_case, c_finish_case): Likewise.
(c_finish_then): Take body for then as argument.
(c_finish_else): Similarly.
(c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): New.
(c_begin_stmt_expr, c_finish_stmt_expr): New.
(c_begin_compound_stmt): Do scope management.
(c_end_compound_stmt): New.
* fold-const.c (tree_expr_nonnegative_p): Fix BIND_EXPR.
* gimplify.c (voidify_wrapper_expr): Accept temporary argument.
Look through exception handling constructs.
(gimplify_bind_expr): Accept temporary argument.
(gimplify_target_expr): Special case BIND_EXPR bodies.
(gimplify_expr): Handle fallback == fb_none like a statement.
* langhooks-def.h (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Kill.
* langhooks.c (lhd_tree_inlining_tree_chain_matters_p): Remove.
* langhooks.h (tree_chain_matters_p): Remove.
* stub-objc.c (objc_clear_super_receiver): New.
* tree-gimple.h (voidify_wrapper_expr): Update decl.
(append_to_statement_list, append_to_statement_list_force): Move
to tree-iterator.h.
* tree-inline.c (expand_call_inline): Update call.
(clone_body): Use statement lists.
(walk_tree): Don't check tree_chain_matters_p.
(copy_tree_r): Likewise.
* tree-iterator.c (alloc_stmt_list): Clear lang bits.
(tsi_link_before, tsi_link_after): Set TREE_SIDE_EFFECTS properly.
* tree-iterator.h (append_to_statement_list,
append_to_statement_list_force): Moved from tree-gimple.h.
* tree-pretty-print.c (dump_generic_node): Clean up TARGET_EXPR dump.
* objc/objc-act.c (build_module_descriptor): Use c_begin_compound_stmt.
(objc_enter_block): Likewise.
(objc_exit_block): Use c_end_compound_stmt.
(objc_build_try_enter_fragment): Add #error and comment for
rewriting for OBJCPLUS.
(objc_build_extract_fragment, objc_build_try_epilogue,
objc_build_catch_stmt, objc_build_finally_prologue,
objc_build_finally_epilogue): Update for C statement builders.
* objc/objc-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P):
Remove.
cp/
* call.c (initialize_reference): Don't build CLEANUP_STMT here.
* cp-gimplify.c (cp_gimplify_stmt): Remove next_p argument.
(genericize_try_block): Use gimplify_stmt.
(genericize_catch_block, genericize_eh_spec_block): Likewise.
(cp_gimplify_init_expr): Remove STMT_EXPR special case.
(gimplify_must_not_throw_expr): Update voidify_wrapper_expr call.
* cp-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
(cp_tree_chain_matters_p): Remove.
* cp-tree.h (COMPOUND_STMT_TRY_BLOCK): New.
(COMPOUND_STMT_BODY_BLOCK): New.
(STATEMENT_LIST_NO_SCOPE, STATEMENT_LIST_TRY_BLOCK): New.
(EXPR_STMT_STMT_EXPR_RESULT): New.
(building_stmt_tree): Check cur_stmt_list.
(tf_stmt_expr_cmpd, tf_stmt_expr_body): Remove.
(BCS_NO_SCOPE, BCS_TRY_BLOCK, BCS_FN_BODY): New.
* decl.c (poplevel): Use pop_stmt_list for minding cleanups.
(cp_finish_decl): Use push_cleanup.
(start_function, finish_function): Use statement lists.
(finish_stmt): Do nothing.
* except.c (begin_eh_spec_block): Use statement lists.
(check_handlers_1, check_handlers): Likewise.
* init.c (construct_virtual_base): Don't add extra compound stmts.
(build_vec_init): Likewise.
* name-lookup.c (maybe_push_cleanup_level): Use statement lists.
* name-lookup.h (struct cp_binding_level): Add statement_list.
* parser.c (cp_parser_statement): Take the STMT_EXPR node, not a bool.
(cp_parser_labeled_statement, cp_parser_expression_statement,
cp_parser_statement_seq_opt): Likewise.
(cp_parser_compound_statement): Likewise. Take bool for try block.
(cp_parser_selection_statement): Tidy if processing.
(cp_parser_already_scoped_statement): Rewrite to do what it says.
* pt.c (tsubst_copy): Move STMT_EXPR to tsubst_expr.
(tsubst_expr): Rewrite STMT_EXPR processing. Handle STATEMENT_LIST.
Mind COMPOUND_STMT_TRY_BLOCK, EXPR_STMT_STMT_EXPR_RESULT.
* semantics.c (do_poplevel, do_pushlevel): Use statement lists.
(finish_cond): New, rewritten from FINISH_COND.
(simplify_loop_decl_cond): New.
(finish_expr_stmt): Avoid nested EXPR_STMTs.
(begin_if_stmt, finish_if_stmt_cond, finish_then_clause,
begin_else_clause, finish_else_clause, finish_if_stmt,
begin_while_stmt, finish_while_stmt_cond, finish_while_stmt,
begin_do_stmt, finish_do_body, begin_for_stmt, finish_for_init_stmt,
finish_for_cond, finish_for_stmt, begin_switch_stmt,
finish_switch_cond, finish_switch_stmt, begin_try_block,
finish_try_block, finish_cleanup_try_block, finish_function_try_block,
finish_handler_sequence, finish_function_handler_sequence,
begin_handler, finish_handler_parms, finish_handler,
begin_stmt_expr, finish_stmt_expr_expr, finish_stmt_expr): Rewrite
using statement lists.
(begin_compound_stmt): Replace has_no_scope argument with flags.
Update all callers. Use statement lists.
(finish_compound_stmt): Likewise.
(finish_decl_cleanup, finish_eh_cleanup): Use push_cleanup.
(current_scope_stmt_stack): Remove.
(simplify_aggr_init_expr): Don't muck with TREE_CHAIN.
* typeck2.c (split_nonconstant_init_1, split_nonconstant_init):
Rewrite with statement lists.
testsuite/
* g++.dg/ext/stmtexpr1.C: XFAIL.
* gcc.dg/20030612-1.c: XFAIL.
From-SVN: r83221
2004-06-16 03:21:38 +02:00
|
|
|
|
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
if (!label)
|
|
|
|
|
|
*label_p = label = create_artificial_label ();
|
|
|
|
|
|
else if (TREE_CODE (label) != LABEL_DECL)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (is_break)
|
|
|
|
|
|
error ("break statement not within loop or switch");
|
|
|
|
|
|
else
|
|
|
|
|
|
error ("continue statement not within a loop");
|
|
|
|
|
|
return NULL_TREE;
|
|
|
|
|
|
}
|
c-common.c (lang_gimplify_stmt): Remove next_p argument.
* c-common.c (lang_gimplify_stmt): Remove next_p argument.
(if_elt, if_stack, if_stack_space, c_expand_start_cond, c_finish_then,
c_expand_end_cond, c_expand_start_else, c_finish_else, c_begin_if_stmt,
c_begin_while_stmt, c_finish_while_stmt_cond): Move to c-typeck.c.
(finish_fname_decls, fname_decl): Use statement_lists.
(c_expand_expr_stmt): Don't set last_expr_type.
(c_type_hash): Fix indentation.
(c_safe_from_p): Don't follow TREE_CHAIN.
(c_tree_chain_matters_p): Remove.
* c-common.def (SCOPE_STMT): Remove.
(CLEANUP_STMT): Redefine to contain its own body.
* c-common.h (struct stmt_tree_s): Remove x_last_stmt,
x_last_expr_type, x_last_expr_filename, x_scope_stmt_stack.
Add x_cur_stmt_list.
(last_tree, last_expr_type, last_expr_filename, RECHAIN_STMTS): Remove.
(cur_stmt_list): New.
(STATEMENT_LIST_STMT_EXPR): New.
(SCOPE_BEGIN_P, SCOPE_END_P, SCOPE_STMT_BLOCK, SCOPE_NULLIFIED_P,
SCOPE_NO_CLEANUPS_P, SCOPE_PARTIAL_P, NEW_FOR_SCOPE_P): Remove.
(CLEANUP_BODY): New.
(CLEANUP_DECL): Move to operand 2.
(c_common_stmt_codes): Remove SCOPE_STMT.
(COMPOUND_STMT_NO_SCOPE, COMPOUND_STMT_BODY_BLOCK): Remove.
* c-decl.c (c_scope_stmt_stack, current_scope_stmt_stack): Remove.
(c_push_function_context, c_pop_function_context): Don't save it.
(finish_decl): Set TREE_USED on the decl for a cleanup.
Use push_cleanup.
(store_parm_decls): Use statement lists.
(finish_function): Remove compstmt rule workaround. Use statement
lists. Call finish_fname_decls after finalizing the body.
(c_begin_compound_stmt): Move to c-typeck.c.
* c-dump.c (c_dump_tree): Remove SCOPE_STMT.
* c-gimplify.c (gimplify_cleanup_stmt, gimplify_cleanup_stmts): New.
(c_genericize): Invoke them.
(c_gimplify_stmt): Don't look through TREE_CHAIN. Kill SCOPE_STMT.
(c_build_bind_expr): Export.
(gimplify_block, gimplify_cleanup): Remove.
(gimplify_condition): Use gimplify_stmt.
(gimplify_for_stmt): Remove FOR_INIT_STMT chaining hack.
(gimplify_if_stmt): Remove recursion hack.
(c_gimplify_expr): Remove STMT_EXPR handling.
(stmt_expr_last_stmt, gimplify_stmt_expr): Remove.
(is_last_stmt_of_scope): Remove.
* c-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
* c-mudflap.c (mflang_flush_calls): Use c_begin_compound_stmt,
c_end_compound_stmt.
* c-objc-common.c (build_cdtor): Likewise.
* c-parse.in (primary): Use c_finish_stmt_expr.
(push_scope, pop_scope): Remove.
(c99_block_start, compstmt_start): Use c_begin_compound_stmt.
(c99_block_end, compstmt): Use c_end_compound_stmt.
(c99_block_lineno_labeled_stmt): Likewise.
(compstmt_primary_start): Use c_begin_stmt_expr.
(simple_if, select_or_iter_stmt): Update calls to stmt builders.
(do_stmt_start): Fill in body directly.
(lineno_stmt): Avoid setting lineno on constants.
* c-pretty-print.c (pp_c_statement): Handle STATEMENT_LIST.
Remove SCOPE_STMT.
* c-semantics.c (begin_stmt_tree): Remove.
(push_stmt_list, re_push_stmt_list, pop_stmt_list): New.
(add_stmt): Use statement lists.
(add_scope_stmt, finish_stmt_tree): Remove.
(push_cleanup): New.
* c-tree.h: Move some decls from c-common.h.
* c-typeck.c (c_tree_expr_nonnegative_p): Simplify for statement lists.
(do_case, c_finish_case): Likewise.
(c_finish_then): Take body for then as argument.
(c_finish_else): Similarly.
(c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): New.
(c_begin_stmt_expr, c_finish_stmt_expr): New.
(c_begin_compound_stmt): Do scope management.
(c_end_compound_stmt): New.
* fold-const.c (tree_expr_nonnegative_p): Fix BIND_EXPR.
* gimplify.c (voidify_wrapper_expr): Accept temporary argument.
Look through exception handling constructs.
(gimplify_bind_expr): Accept temporary argument.
(gimplify_target_expr): Special case BIND_EXPR bodies.
(gimplify_expr): Handle fallback == fb_none like a statement.
* langhooks-def.h (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Kill.
* langhooks.c (lhd_tree_inlining_tree_chain_matters_p): Remove.
* langhooks.h (tree_chain_matters_p): Remove.
* stub-objc.c (objc_clear_super_receiver): New.
* tree-gimple.h (voidify_wrapper_expr): Update decl.
(append_to_statement_list, append_to_statement_list_force): Move
to tree-iterator.h.
* tree-inline.c (expand_call_inline): Update call.
(clone_body): Use statement lists.
(walk_tree): Don't check tree_chain_matters_p.
(copy_tree_r): Likewise.
* tree-iterator.c (alloc_stmt_list): Clear lang bits.
(tsi_link_before, tsi_link_after): Set TREE_SIDE_EFFECTS properly.
* tree-iterator.h (append_to_statement_list,
append_to_statement_list_force): Moved from tree-gimple.h.
* tree-pretty-print.c (dump_generic_node): Clean up TARGET_EXPR dump.
* objc/objc-act.c (build_module_descriptor): Use c_begin_compound_stmt.
(objc_enter_block): Likewise.
(objc_exit_block): Use c_end_compound_stmt.
(objc_build_try_enter_fragment): Add #error and comment for
rewriting for OBJCPLUS.
(objc_build_extract_fragment, objc_build_try_epilogue,
objc_build_catch_stmt, objc_build_finally_prologue,
objc_build_finally_epilogue): Update for C statement builders.
* objc/objc-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P):
Remove.
cp/
* call.c (initialize_reference): Don't build CLEANUP_STMT here.
* cp-gimplify.c (cp_gimplify_stmt): Remove next_p argument.
(genericize_try_block): Use gimplify_stmt.
(genericize_catch_block, genericize_eh_spec_block): Likewise.
(cp_gimplify_init_expr): Remove STMT_EXPR special case.
(gimplify_must_not_throw_expr): Update voidify_wrapper_expr call.
* cp-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
(cp_tree_chain_matters_p): Remove.
* cp-tree.h (COMPOUND_STMT_TRY_BLOCK): New.
(COMPOUND_STMT_BODY_BLOCK): New.
(STATEMENT_LIST_NO_SCOPE, STATEMENT_LIST_TRY_BLOCK): New.
(EXPR_STMT_STMT_EXPR_RESULT): New.
(building_stmt_tree): Check cur_stmt_list.
(tf_stmt_expr_cmpd, tf_stmt_expr_body): Remove.
(BCS_NO_SCOPE, BCS_TRY_BLOCK, BCS_FN_BODY): New.
* decl.c (poplevel): Use pop_stmt_list for minding cleanups.
(cp_finish_decl): Use push_cleanup.
(start_function, finish_function): Use statement lists.
(finish_stmt): Do nothing.
* except.c (begin_eh_spec_block): Use statement lists.
(check_handlers_1, check_handlers): Likewise.
* init.c (construct_virtual_base): Don't add extra compound stmts.
(build_vec_init): Likewise.
* name-lookup.c (maybe_push_cleanup_level): Use statement lists.
* name-lookup.h (struct cp_binding_level): Add statement_list.
* parser.c (cp_parser_statement): Take the STMT_EXPR node, not a bool.
(cp_parser_labeled_statement, cp_parser_expression_statement,
cp_parser_statement_seq_opt): Likewise.
(cp_parser_compound_statement): Likewise. Take bool for try block.
(cp_parser_selection_statement): Tidy if processing.
(cp_parser_already_scoped_statement): Rewrite to do what it says.
* pt.c (tsubst_copy): Move STMT_EXPR to tsubst_expr.
(tsubst_expr): Rewrite STMT_EXPR processing. Handle STATEMENT_LIST.
Mind COMPOUND_STMT_TRY_BLOCK, EXPR_STMT_STMT_EXPR_RESULT.
* semantics.c (do_poplevel, do_pushlevel): Use statement lists.
(finish_cond): New, rewritten from FINISH_COND.
(simplify_loop_decl_cond): New.
(finish_expr_stmt): Avoid nested EXPR_STMTs.
(begin_if_stmt, finish_if_stmt_cond, finish_then_clause,
begin_else_clause, finish_else_clause, finish_if_stmt,
begin_while_stmt, finish_while_stmt_cond, finish_while_stmt,
begin_do_stmt, finish_do_body, begin_for_stmt, finish_for_init_stmt,
finish_for_cond, finish_for_stmt, begin_switch_stmt,
finish_switch_cond, finish_switch_stmt, begin_try_block,
finish_try_block, finish_cleanup_try_block, finish_function_try_block,
finish_handler_sequence, finish_function_handler_sequence,
begin_handler, finish_handler_parms, finish_handler,
begin_stmt_expr, finish_stmt_expr_expr, finish_stmt_expr): Rewrite
using statement lists.
(begin_compound_stmt): Replace has_no_scope argument with flags.
Update all callers. Use statement lists.
(finish_compound_stmt): Likewise.
(finish_decl_cleanup, finish_eh_cleanup): Use push_cleanup.
(current_scope_stmt_stack): Remove.
(simplify_aggr_init_expr): Don't muck with TREE_CHAIN.
* typeck2.c (split_nonconstant_init_1, split_nonconstant_init):
Rewrite with statement lists.
testsuite/
* g++.dg/ext/stmtexpr1.C: XFAIL.
* gcc.dg/20030612-1.c: XFAIL.
From-SVN: r83221
2004-06-16 03:21:38 +02:00
|
|
|
|
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
return add_stmt (build (GOTO_EXPR, void_type_node, label));
|
c-common.c (lang_gimplify_stmt): Remove next_p argument.
* c-common.c (lang_gimplify_stmt): Remove next_p argument.
(if_elt, if_stack, if_stack_space, c_expand_start_cond, c_finish_then,
c_expand_end_cond, c_expand_start_else, c_finish_else, c_begin_if_stmt,
c_begin_while_stmt, c_finish_while_stmt_cond): Move to c-typeck.c.
(finish_fname_decls, fname_decl): Use statement_lists.
(c_expand_expr_stmt): Don't set last_expr_type.
(c_type_hash): Fix indentation.
(c_safe_from_p): Don't follow TREE_CHAIN.
(c_tree_chain_matters_p): Remove.
* c-common.def (SCOPE_STMT): Remove.
(CLEANUP_STMT): Redefine to contain its own body.
* c-common.h (struct stmt_tree_s): Remove x_last_stmt,
x_last_expr_type, x_last_expr_filename, x_scope_stmt_stack.
Add x_cur_stmt_list.
(last_tree, last_expr_type, last_expr_filename, RECHAIN_STMTS): Remove.
(cur_stmt_list): New.
(STATEMENT_LIST_STMT_EXPR): New.
(SCOPE_BEGIN_P, SCOPE_END_P, SCOPE_STMT_BLOCK, SCOPE_NULLIFIED_P,
SCOPE_NO_CLEANUPS_P, SCOPE_PARTIAL_P, NEW_FOR_SCOPE_P): Remove.
(CLEANUP_BODY): New.
(CLEANUP_DECL): Move to operand 2.
(c_common_stmt_codes): Remove SCOPE_STMT.
(COMPOUND_STMT_NO_SCOPE, COMPOUND_STMT_BODY_BLOCK): Remove.
* c-decl.c (c_scope_stmt_stack, current_scope_stmt_stack): Remove.
(c_push_function_context, c_pop_function_context): Don't save it.
(finish_decl): Set TREE_USED on the decl for a cleanup.
Use push_cleanup.
(store_parm_decls): Use statement lists.
(finish_function): Remove compstmt rule workaround. Use statement
lists. Call finish_fname_decls after finalizing the body.
(c_begin_compound_stmt): Move to c-typeck.c.
* c-dump.c (c_dump_tree): Remove SCOPE_STMT.
* c-gimplify.c (gimplify_cleanup_stmt, gimplify_cleanup_stmts): New.
(c_genericize): Invoke them.
(c_gimplify_stmt): Don't look through TREE_CHAIN. Kill SCOPE_STMT.
(c_build_bind_expr): Export.
(gimplify_block, gimplify_cleanup): Remove.
(gimplify_condition): Use gimplify_stmt.
(gimplify_for_stmt): Remove FOR_INIT_STMT chaining hack.
(gimplify_if_stmt): Remove recursion hack.
(c_gimplify_expr): Remove STMT_EXPR handling.
(stmt_expr_last_stmt, gimplify_stmt_expr): Remove.
(is_last_stmt_of_scope): Remove.
* c-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
* c-mudflap.c (mflang_flush_calls): Use c_begin_compound_stmt,
c_end_compound_stmt.
* c-objc-common.c (build_cdtor): Likewise.
* c-parse.in (primary): Use c_finish_stmt_expr.
(push_scope, pop_scope): Remove.
(c99_block_start, compstmt_start): Use c_begin_compound_stmt.
(c99_block_end, compstmt): Use c_end_compound_stmt.
(c99_block_lineno_labeled_stmt): Likewise.
(compstmt_primary_start): Use c_begin_stmt_expr.
(simple_if, select_or_iter_stmt): Update calls to stmt builders.
(do_stmt_start): Fill in body directly.
(lineno_stmt): Avoid setting lineno on constants.
* c-pretty-print.c (pp_c_statement): Handle STATEMENT_LIST.
Remove SCOPE_STMT.
* c-semantics.c (begin_stmt_tree): Remove.
(push_stmt_list, re_push_stmt_list, pop_stmt_list): New.
(add_stmt): Use statement lists.
(add_scope_stmt, finish_stmt_tree): Remove.
(push_cleanup): New.
* c-tree.h: Move some decls from c-common.h.
* c-typeck.c (c_tree_expr_nonnegative_p): Simplify for statement lists.
(do_case, c_finish_case): Likewise.
(c_finish_then): Take body for then as argument.
(c_finish_else): Similarly.
(c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): New.
(c_begin_stmt_expr, c_finish_stmt_expr): New.
(c_begin_compound_stmt): Do scope management.
(c_end_compound_stmt): New.
* fold-const.c (tree_expr_nonnegative_p): Fix BIND_EXPR.
* gimplify.c (voidify_wrapper_expr): Accept temporary argument.
Look through exception handling constructs.
(gimplify_bind_expr): Accept temporary argument.
(gimplify_target_expr): Special case BIND_EXPR bodies.
(gimplify_expr): Handle fallback == fb_none like a statement.
* langhooks-def.h (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Kill.
* langhooks.c (lhd_tree_inlining_tree_chain_matters_p): Remove.
* langhooks.h (tree_chain_matters_p): Remove.
* stub-objc.c (objc_clear_super_receiver): New.
* tree-gimple.h (voidify_wrapper_expr): Update decl.
(append_to_statement_list, append_to_statement_list_force): Move
to tree-iterator.h.
* tree-inline.c (expand_call_inline): Update call.
(clone_body): Use statement lists.
(walk_tree): Don't check tree_chain_matters_p.
(copy_tree_r): Likewise.
* tree-iterator.c (alloc_stmt_list): Clear lang bits.
(tsi_link_before, tsi_link_after): Set TREE_SIDE_EFFECTS properly.
* tree-iterator.h (append_to_statement_list,
append_to_statement_list_force): Moved from tree-gimple.h.
* tree-pretty-print.c (dump_generic_node): Clean up TARGET_EXPR dump.
* objc/objc-act.c (build_module_descriptor): Use c_begin_compound_stmt.
(objc_enter_block): Likewise.
(objc_exit_block): Use c_end_compound_stmt.
(objc_build_try_enter_fragment): Add #error and comment for
rewriting for OBJCPLUS.
(objc_build_extract_fragment, objc_build_try_epilogue,
objc_build_catch_stmt, objc_build_finally_prologue,
objc_build_finally_epilogue): Update for C statement builders.
* objc/objc-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P):
Remove.
cp/
* call.c (initialize_reference): Don't build CLEANUP_STMT here.
* cp-gimplify.c (cp_gimplify_stmt): Remove next_p argument.
(genericize_try_block): Use gimplify_stmt.
(genericize_catch_block, genericize_eh_spec_block): Likewise.
(cp_gimplify_init_expr): Remove STMT_EXPR special case.
(gimplify_must_not_throw_expr): Update voidify_wrapper_expr call.
* cp-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
(cp_tree_chain_matters_p): Remove.
* cp-tree.h (COMPOUND_STMT_TRY_BLOCK): New.
(COMPOUND_STMT_BODY_BLOCK): New.
(STATEMENT_LIST_NO_SCOPE, STATEMENT_LIST_TRY_BLOCK): New.
(EXPR_STMT_STMT_EXPR_RESULT): New.
(building_stmt_tree): Check cur_stmt_list.
(tf_stmt_expr_cmpd, tf_stmt_expr_body): Remove.
(BCS_NO_SCOPE, BCS_TRY_BLOCK, BCS_FN_BODY): New.
* decl.c (poplevel): Use pop_stmt_list for minding cleanups.
(cp_finish_decl): Use push_cleanup.
(start_function, finish_function): Use statement lists.
(finish_stmt): Do nothing.
* except.c (begin_eh_spec_block): Use statement lists.
(check_handlers_1, check_handlers): Likewise.
* init.c (construct_virtual_base): Don't add extra compound stmts.
(build_vec_init): Likewise.
* name-lookup.c (maybe_push_cleanup_level): Use statement lists.
* name-lookup.h (struct cp_binding_level): Add statement_list.
* parser.c (cp_parser_statement): Take the STMT_EXPR node, not a bool.
(cp_parser_labeled_statement, cp_parser_expression_statement,
cp_parser_statement_seq_opt): Likewise.
(cp_parser_compound_statement): Likewise. Take bool for try block.
(cp_parser_selection_statement): Tidy if processing.
(cp_parser_already_scoped_statement): Rewrite to do what it says.
* pt.c (tsubst_copy): Move STMT_EXPR to tsubst_expr.
(tsubst_expr): Rewrite STMT_EXPR processing. Handle STATEMENT_LIST.
Mind COMPOUND_STMT_TRY_BLOCK, EXPR_STMT_STMT_EXPR_RESULT.
* semantics.c (do_poplevel, do_pushlevel): Use statement lists.
(finish_cond): New, rewritten from FINISH_COND.
(simplify_loop_decl_cond): New.
(finish_expr_stmt): Avoid nested EXPR_STMTs.
(begin_if_stmt, finish_if_stmt_cond, finish_then_clause,
begin_else_clause, finish_else_clause, finish_if_stmt,
begin_while_stmt, finish_while_stmt_cond, finish_while_stmt,
begin_do_stmt, finish_do_body, begin_for_stmt, finish_for_init_stmt,
finish_for_cond, finish_for_stmt, begin_switch_stmt,
finish_switch_cond, finish_switch_stmt, begin_try_block,
finish_try_block, finish_cleanup_try_block, finish_function_try_block,
finish_handler_sequence, finish_function_handler_sequence,
begin_handler, finish_handler_parms, finish_handler,
begin_stmt_expr, finish_stmt_expr_expr, finish_stmt_expr): Rewrite
using statement lists.
(begin_compound_stmt): Replace has_no_scope argument with flags.
Update all callers. Use statement lists.
(finish_compound_stmt): Likewise.
(finish_decl_cleanup, finish_eh_cleanup): Use push_cleanup.
(current_scope_stmt_stack): Remove.
(simplify_aggr_init_expr): Don't muck with TREE_CHAIN.
* typeck2.c (split_nonconstant_init_1, split_nonconstant_init):
Rewrite with statement lists.
testsuite/
* g++.dg/ext/stmtexpr1.C: XFAIL.
* gcc.dg/20030612-1.c: XFAIL.
From-SVN: r83221
2004-06-16 03:21:38 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
/* A helper routine for c_process_expr_stmt and c_finish_stmt_expr. */
|
2004-06-21 11:15:29 +02:00
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
|
emit_side_effect_warnings (tree expr)
|
|
|
|
|
|
{
|
2004-06-23 04:33:25 +02:00
|
|
|
|
if (expr == error_mark_node)
|
|
|
|
|
|
;
|
|
|
|
|
|
else if (!TREE_SIDE_EFFECTS (expr))
|
2004-06-21 11:15:29 +02:00
|
|
|
|
{
|
|
|
|
|
|
if (!VOID_TYPE_P (TREE_TYPE (expr)) && !TREE_NO_WARNING (expr))
|
|
|
|
|
|
warning ("%Hstatement with no effect",
|
2004-07-14 20:47:14 +02:00
|
|
|
|
EXPR_HAS_LOCATION (expr) ? EXPR_LOCUS (expr) : &input_location);
|
2004-06-21 11:15:29 +02:00
|
|
|
|
}
|
|
|
|
|
|
else if (warn_unused_value)
|
|
|
|
|
|
warn_if_unused_value (expr, input_location);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
/* Process an expression as if it were a complete statement. Emit
|
|
|
|
|
|
diagnostics, but do not call ADD_STMT. */
|
2004-06-21 11:15:29 +02:00
|
|
|
|
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
tree
|
|
|
|
|
|
c_process_expr_stmt (tree expr)
|
2004-06-21 11:15:29 +02:00
|
|
|
|
{
|
|
|
|
|
|
if (!expr)
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
return NULL_TREE;
|
2004-06-21 11:15:29 +02:00
|
|
|
|
|
|
|
|
|
|
/* Do default conversion if safe and possibly important,
|
|
|
|
|
|
in case within ({...}). */
|
|
|
|
|
|
if ((TREE_CODE (TREE_TYPE (expr)) == ARRAY_TYPE
|
|
|
|
|
|
&& (flag_isoc99 || lvalue_p (expr)))
|
|
|
|
|
|
|| TREE_CODE (TREE_TYPE (expr)) == FUNCTION_TYPE)
|
|
|
|
|
|
expr = default_conversion (expr);
|
|
|
|
|
|
|
|
|
|
|
|
if (warn_sequence_point)
|
|
|
|
|
|
verify_sequence_points (expr);
|
|
|
|
|
|
|
|
|
|
|
|
if (TREE_TYPE (expr) != error_mark_node
|
|
|
|
|
|
&& !COMPLETE_OR_VOID_TYPE_P (TREE_TYPE (expr))
|
|
|
|
|
|
&& TREE_CODE (TREE_TYPE (expr)) != ARRAY_TYPE)
|
|
|
|
|
|
error ("expression statement has incomplete type");
|
|
|
|
|
|
|
|
|
|
|
|
/* If we're not processing a statement expression, warn about unused values.
|
|
|
|
|
|
Warnings for statement expressions will be emitted later, once we figure
|
|
|
|
|
|
out which is the result. */
|
|
|
|
|
|
if (!STATEMENT_LIST_STMT_EXPR (cur_stmt_list)
|
|
|
|
|
|
&& (extra_warnings || warn_unused_value))
|
|
|
|
|
|
emit_side_effect_warnings (expr);
|
|
|
|
|
|
|
|
|
|
|
|
/* If the expression is not of a type to which we cannot assign a line
|
|
|
|
|
|
number, wrap the thing in a no-op NOP_EXPR. */
|
|
|
|
|
|
if (DECL_P (expr) || TREE_CODE_CLASS (TREE_CODE (expr)) == 'c')
|
|
|
|
|
|
expr = build1 (NOP_EXPR, TREE_TYPE (expr), expr);
|
|
|
|
|
|
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
if (EXPR_P (expr))
|
2004-06-30 20:11:14 +02:00
|
|
|
|
SET_EXPR_LOCATION (expr, input_location);
|
c-decl.c (c_in_iteration_stmt, [...]): Remove.
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
From-SVN: r83620
2004-06-25 01:12:30 +02:00
|
|
|
|
|
|
|
|
|
|
return expr;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Emit an expression as a statement. */
|
|
|
|
|
|
|
|
|
|
|
|
tree
|
|
|
|
|
|
c_finish_expr_stmt (tree expr)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (expr)
|
|
|
|
|
|
return add_stmt (c_process_expr_stmt (expr));
|
|
|
|
|
|
else
|
|
|
|
|
|
return NULL;
|
2004-06-21 11:15:29 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Do the opposite and emit a statement as an expression. To begin,
|
|
|
|
|
|
create a new binding level and return it. */
|
c-common.c (lang_gimplify_stmt): Remove next_p argument.
* c-common.c (lang_gimplify_stmt): Remove next_p argument.
(if_elt, if_stack, if_stack_space, c_expand_start_cond, c_finish_then,
c_expand_end_cond, c_expand_start_else, c_finish_else, c_begin_if_stmt,
c_begin_while_stmt, c_finish_while_stmt_cond): Move to c-typeck.c.
(finish_fname_decls, fname_decl): Use statement_lists.
(c_expand_expr_stmt): Don't set last_expr_type.
(c_type_hash): Fix indentation.
(c_safe_from_p): Don't follow TREE_CHAIN.
(c_tree_chain_matters_p): Remove.
* c-common.def (SCOPE_STMT): Remove.
(CLEANUP_STMT): Redefine to contain its own body.
* c-common.h (struct stmt_tree_s): Remove x_last_stmt,
x_last_expr_type, x_last_expr_filename, x_scope_stmt_stack.
Add x_cur_stmt_list.
(last_tree, last_expr_type, last_expr_filename, RECHAIN_STMTS): Remove.
(cur_stmt_list): New.
(STATEMENT_LIST_STMT_EXPR): New.
(SCOPE_BEGIN_P, SCOPE_END_P, SCOPE_STMT_BLOCK, SCOPE_NULLIFIED_P,
SCOPE_NO_CLEANUPS_P, SCOPE_PARTIAL_P, NEW_FOR_SCOPE_P): Remove.
(CLEANUP_BODY): New.
(CLEANUP_DECL): Move to operand 2.
(c_common_stmt_codes): Remove SCOPE_STMT.
(COMPOUND_STMT_NO_SCOPE, COMPOUND_STMT_BODY_BLOCK): Remove.
* c-decl.c (c_scope_stmt_stack, current_scope_stmt_stack): Remove.
(c_push_function_context, c_pop_function_context): Don't save it.
(finish_decl): Set TREE_USED on the decl for a cleanup.
Use push_cleanup.
(store_parm_decls): Use statement lists.
(finish_function): Remove compstmt rule workaround. Use statement
lists. Call finish_fname_decls after finalizing the body.
(c_begin_compound_stmt): Move to c-typeck.c.
* c-dump.c (c_dump_tree): Remove SCOPE_STMT.
* c-gimplify.c (gimplify_cleanup_stmt, gimplify_cleanup_stmts): New.
(c_genericize): Invoke them.
(c_gimplify_stmt): Don't look through TREE_CHAIN. Kill SCOPE_STMT.
(c_build_bind_expr): Export.
(gimplify_block, gimplify_cleanup): Remove.
(gimplify_condition): Use gimplify_stmt.
(gimplify_for_stmt): Remove FOR_INIT_STMT chaining hack.
(gimplify_if_stmt): Remove recursion hack.
(c_gimplify_expr): Remove STMT_EXPR handling.
(stmt_expr_last_stmt, gimplify_stmt_expr): Remove.
(is_last_stmt_of_scope): Remove.
* c-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
* c-mudflap.c (mflang_flush_calls): Use c_begin_compound_stmt,
c_end_compound_stmt.
* c-objc-common.c (build_cdtor): Likewise.
* c-parse.in (primary): Use c_finish_stmt_expr.
(push_scope, pop_scope): Remove.
(c99_block_start, compstmt_start): Use c_begin_compound_stmt.
(c99_block_end, compstmt): Use c_end_compound_stmt.
(c99_block_lineno_labeled_stmt): Likewise.
(compstmt_primary_start): Use c_begin_stmt_expr.
(simple_if, select_or_iter_stmt): Update calls to stmt builders.
(do_stmt_start): Fill in body directly.
(lineno_stmt): Avoid setting lineno on constants.
* c-pretty-print.c (pp_c_statement): Handle STATEMENT_LIST.
Remove SCOPE_STMT.
* c-semantics.c (begin_stmt_tree): Remove.
(push_stmt_list, re_push_stmt_list, pop_stmt_list): New.
(add_stmt): Use statement lists.
(add_scope_stmt, finish_stmt_tree): Remove.
(push_cleanup): New.
* c-tree.h: Move some decls from c-common.h.
* c-typeck.c (c_tree_expr_nonnegative_p): Simplify for statement lists.
(do_case, c_finish_case): Likewise.
(c_finish_then): Take body for then as argument.
(c_finish_else): Similarly.
(c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): New.
(c_begin_stmt_expr, c_finish_stmt_expr): New.
(c_begin_compound_stmt): Do scope management.
(c_end_compound_stmt): New.
* fold-const.c (tree_expr_nonnegative_p): Fix BIND_EXPR.
* gimplify.c (voidify_wrapper_expr): Accept temporary argument.
Look through exception handling constructs.
(gimplify_bind_expr): Accept temporary argument.
(gimplify_target_expr): Special case BIND_EXPR bodies.
(gimplify_expr): Handle fallback == fb_none like a statement.
* langhooks-def.h (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Kill.
* langhooks.c (lhd_tree_inlining_tree_chain_matters_p): Remove.
* langhooks.h (tree_chain_matters_p): Remove.
* stub-objc.c (objc_clear_super_receiver): New.
* tree-gimple.h (voidify_wrapper_expr): Update decl.
(append_to_statement_list, append_to_statement_list_force): Move
to tree-iterator.h.
* tree-inline.c (expand_call_inline): Update call.
(clone_body): Use statement lists.
(walk_tree): Don't check tree_chain_matters_p.
(copy_tree_r): Likewise.
* tree-iterator.c (alloc_stmt_list): Clear lang bits.
(tsi_link_before, tsi_link_after): Set TREE_SIDE_EFFECTS properly.
* tree-iterator.h (append_to_statement_list,
append_to_statement_list_force): Moved from tree-gimple.h.
* tree-pretty-print.c (dump_generic_node): Clean up TARGET_EXPR dump.
* objc/objc-act.c (build_module_descriptor): Use c_begin_compound_stmt.
(objc_enter_block): Likewise.
(objc_exit_block): Use c_end_compound_stmt.
(objc_build_try_enter_fragment): Add #error and comment for
rewriting for OBJCPLUS.
(objc_build_extract_fragment, objc_build_try_epilogue,
objc_build_catch_stmt, objc_build_finally_prologue,
objc_build_finally_epilogue): Update for C statement builders.
* objc/objc-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P):
Remove.
cp/
* call.c (initialize_reference): Don't build CLEANUP_STMT here.
* cp-gimplify.c (cp_gimplify_stmt): Remove next_p argument.
(genericize_try_block): Use gimplify_stmt.
(genericize_catch_block, genericize_eh_spec_block): Likewise.
(cp_gimplify_init_expr): Remove STMT_EXPR special case.
(gimplify_must_not_throw_expr): Update voidify_wrapper_expr call.
* cp-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
(cp_tree_chain_matters_p): Remove.
* cp-tree.h (COMPOUND_STMT_TRY_BLOCK): New.
(COMPOUND_STMT_BODY_BLOCK): New.
(STATEMENT_LIST_NO_SCOPE, STATEMENT_LIST_TRY_BLOCK): New.
(EXPR_STMT_STMT_EXPR_RESULT): New.
(building_stmt_tree): Check cur_stmt_list.
(tf_stmt_expr_cmpd, tf_stmt_expr_body): Remove.
(BCS_NO_SCOPE, BCS_TRY_BLOCK, BCS_FN_BODY): New.
* decl.c (poplevel): Use pop_stmt_list for minding cleanups.
(cp_finish_decl): Use push_cleanup.
(start_function, finish_function): Use statement lists.
(finish_stmt): Do nothing.
* except.c (begin_eh_spec_block): Use statement lists.
(check_handlers_1, check_handlers): Likewise.
* init.c (construct_virtual_base): Don't add extra compound stmts.
(build_vec_init): Likewise.
* name-lookup.c (maybe_push_cleanup_level): Use statement lists.
* name-lookup.h (struct cp_binding_level): Add statement_list.
* parser.c (cp_parser_statement): Take the STMT_EXPR node, not a bool.
(cp_parser_labeled_statement, cp_parser_expression_statement,
cp_parser_statement_seq_opt): Likewise.
(cp_parser_compound_statement): Likewise. Take bool for try block.
(cp_parser_selection_statement): Tidy if processing.
(cp_parser_already_scoped_statement): Rewrite to do what it says.
* pt.c (tsubst_copy): Move STMT_EXPR to tsubst_expr.
(tsubst_expr): Rewrite STMT_EXPR processing. Handle STATEMENT_LIST.
Mind COMPOUND_STMT_TRY_BLOCK, EXPR_STMT_STMT_EXPR_RESULT.
* semantics.c (do_poplevel, do_pushlevel): Use statement lists.
(finish_cond): New, rewritten from FINISH_COND.
(simplify_loop_decl_cond): New.
(finish_expr_stmt): Avoid nested EXPR_STMTs.
(begin_if_stmt, finish_if_stmt_cond, finish_then_clause,
begin_else_clause, finish_else_clause, finish_if_stmt,
begin_while_stmt, finish_while_stmt_cond, finish_while_stmt,
begin_do_stmt, finish_do_body, begin_for_stmt, finish_for_init_stmt,
finish_for_cond, finish_for_stmt, begin_switch_stmt,
finish_switch_cond, finish_switch_stmt, begin_try_block,
finish_try_block, finish_cleanup_try_block, finish_function_try_block,
finish_handler_sequence, finish_function_handler_sequence,
begin_handler, finish_handler_parms, finish_handler,
begin_stmt_expr, finish_stmt_expr_expr, finish_stmt_expr): Rewrite
using statement lists.
(begin_compound_stmt): Replace has_no_scope argument with flags.
Update all callers. Use statement lists.
(finish_compound_stmt): Likewise.
(finish_decl_cleanup, finish_eh_cleanup): Use push_cleanup.
(current_scope_stmt_stack): Remove.
(simplify_aggr_init_expr): Don't muck with TREE_CHAIN.
* typeck2.c (split_nonconstant_init_1, split_nonconstant_init):
Rewrite with statement lists.
testsuite/
* g++.dg/ext/stmtexpr1.C: XFAIL.
* gcc.dg/20030612-1.c: XFAIL.
From-SVN: r83221
2004-06-16 03:21:38 +02:00
|
|
|
|
|
|
|
|
|
|
tree
|
|
|
|
|
|
c_begin_stmt_expr (void)
|
|
|
|
|
|
{
|
|
|
|
|
|
tree ret;
|
|
|
|
|
|
|
|
|
|
|
|
/* We must force a BLOCK for this level so that, if it is not expanded
|
|
|
|
|
|
later, there is a way to turn off the entire subtree of blocks that
|
|
|
|
|
|
are contained in it. */
|
|
|
|
|
|
keep_next_level ();
|
|
|
|
|
|
ret = c_begin_compound_stmt (true);
|
|
|
|
|
|
|
|
|
|
|
|
/* Mark the current statement list as belonging to a statement list. */
|
|
|
|
|
|
STATEMENT_LIST_STMT_EXPR (ret) = 1;
|
|
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
tree
|
|
|
|
|
|
c_finish_stmt_expr (tree body)
|
|
|
|
|
|
{
|
2004-06-21 11:15:29 +02:00
|
|
|
|
tree last, type, tmp, val;
|
c-common.c (lang_gimplify_stmt): Remove next_p argument.
* c-common.c (lang_gimplify_stmt): Remove next_p argument.
(if_elt, if_stack, if_stack_space, c_expand_start_cond, c_finish_then,
c_expand_end_cond, c_expand_start_else, c_finish_else, c_begin_if_stmt,
c_begin_while_stmt, c_finish_while_stmt_cond): Move to c-typeck.c.
(finish_fname_decls, fname_decl): Use statement_lists.
(c_expand_expr_stmt): Don't set last_expr_type.
(c_type_hash): Fix indentation.
(c_safe_from_p): Don't follow TREE_CHAIN.
(c_tree_chain_matters_p): Remove.
* c-common.def (SCOPE_STMT): Remove.
(CLEANUP_STMT): Redefine to contain its own body.
* c-common.h (struct stmt_tree_s): Remove x_last_stmt,
x_last_expr_type, x_last_expr_filename, x_scope_stmt_stack.
Add x_cur_stmt_list.
(last_tree, last_expr_type, last_expr_filename, RECHAIN_STMTS): Remove.
(cur_stmt_list): New.
(STATEMENT_LIST_STMT_EXPR): New.
(SCOPE_BEGIN_P, SCOPE_END_P, SCOPE_STMT_BLOCK, SCOPE_NULLIFIED_P,
SCOPE_NO_CLEANUPS_P, SCOPE_PARTIAL_P, NEW_FOR_SCOPE_P): Remove.
(CLEANUP_BODY): New.
(CLEANUP_DECL): Move to operand 2.
(c_common_stmt_codes): Remove SCOPE_STMT.
(COMPOUND_STMT_NO_SCOPE, COMPOUND_STMT_BODY_BLOCK): Remove.
* c-decl.c (c_scope_stmt_stack, current_scope_stmt_stack): Remove.
(c_push_function_context, c_pop_function_context): Don't save it.
(finish_decl): Set TREE_USED on the decl for a cleanup.
Use push_cleanup.
(store_parm_decls): Use statement lists.
(finish_function): Remove compstmt rule workaround. Use statement
lists. Call finish_fname_decls after finalizing the body.
(c_begin_compound_stmt): Move to c-typeck.c.
* c-dump.c (c_dump_tree): Remove SCOPE_STMT.
* c-gimplify.c (gimplify_cleanup_stmt, gimplify_cleanup_stmts): New.
(c_genericize): Invoke them.
(c_gimplify_stmt): Don't look through TREE_CHAIN. Kill SCOPE_STMT.
(c_build_bind_expr): Export.
(gimplify_block, gimplify_cleanup): Remove.
(gimplify_condition): Use gimplify_stmt.
(gimplify_for_stmt): Remove FOR_INIT_STMT chaining hack.
(gimplify_if_stmt): Remove recursion hack.
(c_gimplify_expr): Remove STMT_EXPR handling.
(stmt_expr_last_stmt, gimplify_stmt_expr): Remove.
(is_last_stmt_of_scope): Remove.
* c-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
* c-mudflap.c (mflang_flush_calls): Use c_begin_compound_stmt,
c_end_compound_stmt.
* c-objc-common.c (build_cdtor): Likewise.
* c-parse.in (primary): Use c_finish_stmt_expr.
(push_scope, pop_scope): Remove.
(c99_block_start, compstmt_start): Use c_begin_compound_stmt.
(c99_block_end, compstmt): Use c_end_compound_stmt.
(c99_block_lineno_labeled_stmt): Likewise.
(compstmt_primary_start): Use c_begin_stmt_expr.
(simple_if, select_or_iter_stmt): Update calls to stmt builders.
(do_stmt_start): Fill in body directly.
(lineno_stmt): Avoid setting lineno on constants.
* c-pretty-print.c (pp_c_statement): Handle STATEMENT_LIST.
Remove SCOPE_STMT.
* c-semantics.c (begin_stmt_tree): Remove.
(push_stmt_list, re_push_stmt_list, pop_stmt_list): New.
(add_stmt): Use statement lists.
(add_scope_stmt, finish_stmt_tree): Remove.
(push_cleanup): New.
* c-tree.h: Move some decls from c-common.h.
* c-typeck.c (c_tree_expr_nonnegative_p): Simplify for statement lists.
(do_case, c_finish_case): Likewise.
(c_finish_then): Take body for then as argument.
(c_finish_else): Similarly.
(c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): New.
(c_begin_stmt_expr, c_finish_stmt_expr): New.
(c_begin_compound_stmt): Do scope management.
(c_end_compound_stmt): New.
* fold-const.c (tree_expr_nonnegative_p): Fix BIND_EXPR.
* gimplify.c (voidify_wrapper_expr): Accept temporary argument.
Look through exception handling constructs.
(gimplify_bind_expr): Accept temporary argument.
(gimplify_target_expr): Special case BIND_EXPR bodies.
(gimplify_expr): Handle fallback == fb_none like a statement.
* langhooks-def.h (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Kill.
* langhooks.c (lhd_tree_inlining_tree_chain_matters_p): Remove.
* langhooks.h (tree_chain_matters_p): Remove.
* stub-objc.c (objc_clear_super_receiver): New.
* tree-gimple.h (voidify_wrapper_expr): Update decl.
(append_to_statement_list, append_to_statement_list_force): Move
to tree-iterator.h.
* tree-inline.c (expand_call_inline): Update call.
(clone_body): Use statement lists.
(walk_tree): Don't check tree_chain_matters_p.
(copy_tree_r): Likewise.
* tree-iterator.c (alloc_stmt_list): Clear lang bits.
(tsi_link_before, tsi_link_after): Set TREE_SIDE_EFFECTS properly.
* tree-iterator.h (append_to_statement_list,
append_to_statement_list_force): Moved from tree-gimple.h.
* tree-pretty-print.c (dump_generic_node): Clean up TARGET_EXPR dump.
* objc/objc-act.c (build_module_descriptor): Use c_begin_compound_stmt.
(objc_enter_block): Likewise.
(objc_exit_block): Use c_end_compound_stmt.
(objc_build_try_enter_fragment): Add #error and comment for
rewriting for OBJCPLUS.
(objc_build_extract_fragment, objc_build_try_epilogue,
objc_build_catch_stmt, objc_build_finally_prologue,
objc_build_finally_epilogue): Update for C statement builders.
* objc/objc-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P):
Remove.
cp/
* call.c (initialize_reference): Don't build CLEANUP_STMT here.
* cp-gimplify.c (cp_gimplify_stmt): Remove next_p argument.
(genericize_try_block): Use gimplify_stmt.
(genericize_catch_block, genericize_eh_spec_block): Likewise.
(cp_gimplify_init_expr): Remove STMT_EXPR special case.
(gimplify_must_not_throw_expr): Update voidify_wrapper_expr call.
* cp-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
(cp_tree_chain_matters_p): Remove.
* cp-tree.h (COMPOUND_STMT_TRY_BLOCK): New.
(COMPOUND_STMT_BODY_BLOCK): New.
(STATEMENT_LIST_NO_SCOPE, STATEMENT_LIST_TRY_BLOCK): New.
(EXPR_STMT_STMT_EXPR_RESULT): New.
(building_stmt_tree): Check cur_stmt_list.
(tf_stmt_expr_cmpd, tf_stmt_expr_body): Remove.
(BCS_NO_SCOPE, BCS_TRY_BLOCK, BCS_FN_BODY): New.
* decl.c (poplevel): Use pop_stmt_list for minding cleanups.
(cp_finish_decl): Use push_cleanup.
(start_function, finish_function): Use statement lists.
(finish_stmt): Do nothing.
* except.c (begin_eh_spec_block): Use statement lists.
(check_handlers_1, check_handlers): Likewise.
* init.c (construct_virtual_base): Don't add extra compound stmts.
(build_vec_init): Likewise.
* name-lookup.c (maybe_push_cleanup_level): Use statement lists.
* name-lookup.h (struct cp_binding_level): Add statement_list.
* parser.c (cp_parser_statement): Take the STMT_EXPR node, not a bool.
(cp_parser_labeled_statement, cp_parser_expression_statement,
cp_parser_statement_seq_opt): Likewise.
(cp_parser_compound_statement): Likewise. Take bool for try block.
(cp_parser_selection_statement): Tidy if processing.
(cp_parser_already_scoped_statement): Rewrite to do what it says.
* pt.c (tsubst_copy): Move STMT_EXPR to tsubst_expr.
(tsubst_expr): Rewrite STMT_EXPR processing. Handle STATEMENT_LIST.
Mind COMPOUND_STMT_TRY_BLOCK, EXPR_STMT_STMT_EXPR_RESULT.
* semantics.c (do_poplevel, do_pushlevel): Use statement lists.
(finish_cond): New, rewritten from FINISH_COND.
(simplify_loop_decl_cond): New.
(finish_expr_stmt): Avoid nested EXPR_STMTs.
(begin_if_stmt, finish_if_stmt_cond, finish_then_clause,
begin_else_clause, finish_else_clause, finish_if_stmt,
begin_while_stmt, finish_while_stmt_cond, finish_while_stmt,
begin_do_stmt, finish_do_body, begin_for_stmt, finish_for_init_stmt,
finish_for_cond, finish_for_stmt, begin_switch_stmt,
finish_switch_cond, finish_switch_stmt, begin_try_block,
finish_try_block, finish_cleanup_try_block, finish_function_try_block,
finish_handler_sequence, finish_function_handler_sequence,
begin_handler, finish_handler_parms, finish_handler,
begin_stmt_expr, finish_stmt_expr_expr, finish_stmt_expr): Rewrite
using statement lists.
(begin_compound_stmt): Replace has_no_scope argument with flags.
Update all callers. Use statement lists.
(finish_compound_stmt): Likewise.
(finish_decl_cleanup, finish_eh_cleanup): Use push_cleanup.
(current_scope_stmt_stack): Remove.
(simplify_aggr_init_expr): Don't muck with TREE_CHAIN.
* typeck2.c (split_nonconstant_init_1, split_nonconstant_init):
Rewrite with statement lists.
testsuite/
* g++.dg/ext/stmtexpr1.C: XFAIL.
* gcc.dg/20030612-1.c: XFAIL.
From-SVN: r83221
2004-06-16 03:21:38 +02:00
|
|
|
|
tree *last_p;
|
|
|
|
|
|
|
|
|
|
|
|
body = c_end_compound_stmt (body, true);
|
|
|
|
|
|
|
2004-06-21 11:15:29 +02:00
|
|
|
|
/* Locate the last statement in BODY. See c_end_compound_stmt
|
|
|
|
|
|
about always returning a BIND_EXPR. */
|
|
|
|
|
|
last_p = &BIND_EXPR_BODY (body);
|
|
|
|
|
|
last = BIND_EXPR_BODY (body);
|
|
|
|
|
|
|
|
|
|
|
|
continue_searching:
|
c-common.c (lang_gimplify_stmt): Remove next_p argument.
* c-common.c (lang_gimplify_stmt): Remove next_p argument.
(if_elt, if_stack, if_stack_space, c_expand_start_cond, c_finish_then,
c_expand_end_cond, c_expand_start_else, c_finish_else, c_begin_if_stmt,
c_begin_while_stmt, c_finish_while_stmt_cond): Move to c-typeck.c.
(finish_fname_decls, fname_decl): Use statement_lists.
(c_expand_expr_stmt): Don't set last_expr_type.
(c_type_hash): Fix indentation.
(c_safe_from_p): Don't follow TREE_CHAIN.
(c_tree_chain_matters_p): Remove.
* c-common.def (SCOPE_STMT): Remove.
(CLEANUP_STMT): Redefine to contain its own body.
* c-common.h (struct stmt_tree_s): Remove x_last_stmt,
x_last_expr_type, x_last_expr_filename, x_scope_stmt_stack.
Add x_cur_stmt_list.
(last_tree, last_expr_type, last_expr_filename, RECHAIN_STMTS): Remove.
(cur_stmt_list): New.
(STATEMENT_LIST_STMT_EXPR): New.
(SCOPE_BEGIN_P, SCOPE_END_P, SCOPE_STMT_BLOCK, SCOPE_NULLIFIED_P,
SCOPE_NO_CLEANUPS_P, SCOPE_PARTIAL_P, NEW_FOR_SCOPE_P): Remove.
(CLEANUP_BODY): New.
(CLEANUP_DECL): Move to operand 2.
(c_common_stmt_codes): Remove SCOPE_STMT.
(COMPOUND_STMT_NO_SCOPE, COMPOUND_STMT_BODY_BLOCK): Remove.
* c-decl.c (c_scope_stmt_stack, current_scope_stmt_stack): Remove.
(c_push_function_context, c_pop_function_context): Don't save it.
(finish_decl): Set TREE_USED on the decl for a cleanup.
Use push_cleanup.
(store_parm_decls): Use statement lists.
(finish_function): Remove compstmt rule workaround. Use statement
lists. Call finish_fname_decls after finalizing the body.
(c_begin_compound_stmt): Move to c-typeck.c.
* c-dump.c (c_dump_tree): Remove SCOPE_STMT.
* c-gimplify.c (gimplify_cleanup_stmt, gimplify_cleanup_stmts): New.
(c_genericize): Invoke them.
(c_gimplify_stmt): Don't look through TREE_CHAIN. Kill SCOPE_STMT.
(c_build_bind_expr): Export.
(gimplify_block, gimplify_cleanup): Remove.
(gimplify_condition): Use gimplify_stmt.
(gimplify_for_stmt): Remove FOR_INIT_STMT chaining hack.
(gimplify_if_stmt): Remove recursion hack.
(c_gimplify_expr): Remove STMT_EXPR handling.
(stmt_expr_last_stmt, gimplify_stmt_expr): Remove.
(is_last_stmt_of_scope): Remove.
* c-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
* c-mudflap.c (mflang_flush_calls): Use c_begin_compound_stmt,
c_end_compound_stmt.
* c-objc-common.c (build_cdtor): Likewise.
* c-parse.in (primary): Use c_finish_stmt_expr.
(push_scope, pop_scope): Remove.
(c99_block_start, compstmt_start): Use c_begin_compound_stmt.
(c99_block_end, compstmt): Use c_end_compound_stmt.
(c99_block_lineno_labeled_stmt): Likewise.
(compstmt_primary_start): Use c_begin_stmt_expr.
(simple_if, select_or_iter_stmt): Update calls to stmt builders.
(do_stmt_start): Fill in body directly.
(lineno_stmt): Avoid setting lineno on constants.
* c-pretty-print.c (pp_c_statement): Handle STATEMENT_LIST.
Remove SCOPE_STMT.
* c-semantics.c (begin_stmt_tree): Remove.
(push_stmt_list, re_push_stmt_list, pop_stmt_list): New.
(add_stmt): Use statement lists.
(add_scope_stmt, finish_stmt_tree): Remove.
(push_cleanup): New.
* c-tree.h: Move some decls from c-common.h.
* c-typeck.c (c_tree_expr_nonnegative_p): Simplify for statement lists.
(do_case, c_finish_case): Likewise.
(c_finish_then): Take body for then as argument.
(c_finish_else): Similarly.
(c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): New.
(c_begin_stmt_expr, c_finish_stmt_expr): New.
(c_begin_compound_stmt): Do scope management.
(c_end_compound_stmt): New.
* fold-const.c (tree_expr_nonnegative_p): Fix BIND_EXPR.
* gimplify.c (voidify_wrapper_expr): Accept temporary argument.
Look through exception handling constructs.
(gimplify_bind_expr): Accept temporary argument.
(gimplify_target_expr): Special case BIND_EXPR bodies.
(gimplify_expr): Handle fallback == fb_none like a statement.
* langhooks-def.h (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Kill.
* langhooks.c (lhd_tree_inlining_tree_chain_matters_p): Remove.
* langhooks.h (tree_chain_matters_p): Remove.
* stub-objc.c (objc_clear_super_receiver): New.
* tree-gimple.h (voidify_wrapper_expr): Update decl.
(append_to_statement_list, append_to_statement_list_force): Move
to tree-iterator.h.
* tree-inline.c (expand_call_inline): Update call.
(clone_body): Use statement lists.
(walk_tree): Don't check tree_chain_matters_p.
(copy_tree_r): Likewise.
* tree-iterator.c (alloc_stmt_list): Clear lang bits.
(tsi_link_before, tsi_link_after): Set TREE_SIDE_EFFECTS properly.
* tree-iterator.h (append_to_statement_list,
append_to_statement_list_force): Moved from tree-gimple.h.
* tree-pretty-print.c (dump_generic_node): Clean up TARGET_EXPR dump.
* objc/objc-act.c (build_module_descriptor): Use c_begin_compound_stmt.
(objc_enter_block): Likewise.
(objc_exit_block): Use c_end_compound_stmt.
(objc_build_try_enter_fragment): Add #error and comment for
rewriting for OBJCPLUS.
(objc_build_extract_fragment, objc_build_try_epilogue,
objc_build_catch_stmt, objc_build_finally_prologue,
objc_build_finally_epilogue): Update for C statement builders.
* objc/objc-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P):
Remove.
cp/
* call.c (initialize_reference): Don't build CLEANUP_STMT here.
* cp-gimplify.c (cp_gimplify_stmt): Remove next_p argument.
(genericize_try_block): Use gimplify_stmt.
(genericize_catch_block, genericize_eh_spec_block): Likewise.
(cp_gimplify_init_expr): Remove STMT_EXPR special case.
(gimplify_must_not_throw_expr): Update voidify_wrapper_expr call.
* cp-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
(cp_tree_chain_matters_p): Remove.
* cp-tree.h (COMPOUND_STMT_TRY_BLOCK): New.
(COMPOUND_STMT_BODY_BLOCK): New.
(STATEMENT_LIST_NO_SCOPE, STATEMENT_LIST_TRY_BLOCK): New.
(EXPR_STMT_STMT_EXPR_RESULT): New.
(building_stmt_tree): Check cur_stmt_list.
(tf_stmt_expr_cmpd, tf_stmt_expr_body): Remove.
(BCS_NO_SCOPE, BCS_TRY_BLOCK, BCS_FN_BODY): New.
* decl.c (poplevel): Use pop_stmt_list for minding cleanups.
(cp_finish_decl): Use push_cleanup.
(start_function, finish_function): Use statement lists.
(finish_stmt): Do nothing.
* except.c (begin_eh_spec_block): Use statement lists.
(check_handlers_1, check_handlers): Likewise.
* init.c (construct_virtual_base): Don't add extra compound stmts.
(build_vec_init): Likewise.
* name-lookup.c (maybe_push_cleanup_level): Use statement lists.
* name-lookup.h (struct cp_binding_level): Add statement_list.
* parser.c (cp_parser_statement): Take the STMT_EXPR node, not a bool.
(cp_parser_labeled_statement, cp_parser_expression_statement,
cp_parser_statement_seq_opt): Likewise.
(cp_parser_compound_statement): Likewise. Take bool for try block.
(cp_parser_selection_statement): Tidy if processing.
(cp_parser_already_scoped_statement): Rewrite to do what it says.
* pt.c (tsubst_copy): Move STMT_EXPR to tsubst_expr.
(tsubst_expr): Rewrite STMT_EXPR processing. Handle STATEMENT_LIST.
Mind COMPOUND_STMT_TRY_BLOCK, EXPR_STMT_STMT_EXPR_RESULT.
* semantics.c (do_poplevel, do_pushlevel): Use statement lists.
(finish_cond): New, rewritten from FINISH_COND.
(simplify_loop_decl_cond): New.
(finish_expr_stmt): Avoid nested EXPR_STMTs.
(begin_if_stmt, finish_if_stmt_cond, finish_then_clause,
begin_else_clause, finish_else_clause, finish_if_stmt,
begin_while_stmt, finish_while_stmt_cond, finish_while_stmt,
begin_do_stmt, finish_do_body, begin_for_stmt, finish_for_init_stmt,
finish_for_cond, finish_for_stmt, begin_switch_stmt,
finish_switch_cond, finish_switch_stmt, begin_try_block,
finish_try_block, finish_cleanup_try_block, finish_function_try_block,
finish_handler_sequence, finish_function_handler_sequence,
begin_handler, finish_handler_parms, finish_handler,
begin_stmt_expr, finish_stmt_expr_expr, finish_stmt_expr): Rewrite
using statement lists.
(begin_compound_stmt): Replace has_no_scope argument with flags.
Update all callers. Use statement lists.
(finish_compound_stmt): Likewise.
(finish_decl_cleanup, finish_eh_cleanup): Use push_cleanup.
(current_scope_stmt_stack): Remove.
(simplify_aggr_init_expr): Don't muck with TREE_CHAIN.
* typeck2.c (split_nonconstant_init_1, split_nonconstant_init):
Rewrite with statement lists.
testsuite/
* g++.dg/ext/stmtexpr1.C: XFAIL.
* gcc.dg/20030612-1.c: XFAIL.
From-SVN: r83221
2004-06-16 03:21:38 +02:00
|
|
|
|
if (TREE_CODE (last) == STATEMENT_LIST)
|
|
|
|
|
|
{
|
2004-06-21 11:15:29 +02:00
|
|
|
|
tree_stmt_iterator i;
|
|
|
|
|
|
|
|
|
|
|
|
/* This can happen with degenerate cases like ({ }). No value. */
|
|
|
|
|
|
if (!TREE_SIDE_EFFECTS (last))
|
|
|
|
|
|
return body;
|
|
|
|
|
|
|
|
|
|
|
|
/* If we're supposed to generate side effects warnings, process
|
|
|
|
|
|
all of the statements except the last. */
|
|
|
|
|
|
if (extra_warnings || warn_unused_value)
|
c-common.c (lang_gimplify_stmt): Remove next_p argument.
* c-common.c (lang_gimplify_stmt): Remove next_p argument.
(if_elt, if_stack, if_stack_space, c_expand_start_cond, c_finish_then,
c_expand_end_cond, c_expand_start_else, c_finish_else, c_begin_if_stmt,
c_begin_while_stmt, c_finish_while_stmt_cond): Move to c-typeck.c.
(finish_fname_decls, fname_decl): Use statement_lists.
(c_expand_expr_stmt): Don't set last_expr_type.
(c_type_hash): Fix indentation.
(c_safe_from_p): Don't follow TREE_CHAIN.
(c_tree_chain_matters_p): Remove.
* c-common.def (SCOPE_STMT): Remove.
(CLEANUP_STMT): Redefine to contain its own body.
* c-common.h (struct stmt_tree_s): Remove x_last_stmt,
x_last_expr_type, x_last_expr_filename, x_scope_stmt_stack.
Add x_cur_stmt_list.
(last_tree, last_expr_type, last_expr_filename, RECHAIN_STMTS): Remove.
(cur_stmt_list): New.
(STATEMENT_LIST_STMT_EXPR): New.
(SCOPE_BEGIN_P, SCOPE_END_P, SCOPE_STMT_BLOCK, SCOPE_NULLIFIED_P,
SCOPE_NO_CLEANUPS_P, SCOPE_PARTIAL_P, NEW_FOR_SCOPE_P): Remove.
(CLEANUP_BODY): New.
(CLEANUP_DECL): Move to operand 2.
(c_common_stmt_codes): Remove SCOPE_STMT.
(COMPOUND_STMT_NO_SCOPE, COMPOUND_STMT_BODY_BLOCK): Remove.
* c-decl.c (c_scope_stmt_stack, current_scope_stmt_stack): Remove.
(c_push_function_context, c_pop_function_context): Don't save it.
(finish_decl): Set TREE_USED on the decl for a cleanup.
Use push_cleanup.
(store_parm_decls): Use statement lists.
(finish_function): Remove compstmt rule workaround. Use statement
lists. Call finish_fname_decls after finalizing the body.
(c_begin_compound_stmt): Move to c-typeck.c.
* c-dump.c (c_dump_tree): Remove SCOPE_STMT.
* c-gimplify.c (gimplify_cleanup_stmt, gimplify_cleanup_stmts): New.
(c_genericize): Invoke them.
(c_gimplify_stmt): Don't look through TREE_CHAIN. Kill SCOPE_STMT.
(c_build_bind_expr): Export.
(gimplify_block, gimplify_cleanup): Remove.
(gimplify_condition): Use gimplify_stmt.
(gimplify_for_stmt): Remove FOR_INIT_STMT chaining hack.
(gimplify_if_stmt): Remove recursion hack.
(c_gimplify_expr): Remove STMT_EXPR handling.
(stmt_expr_last_stmt, gimplify_stmt_expr): Remove.
(is_last_stmt_of_scope): Remove.
* c-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
* c-mudflap.c (mflang_flush_calls): Use c_begin_compound_stmt,
c_end_compound_stmt.
* c-objc-common.c (build_cdtor): Likewise.
* c-parse.in (primary): Use c_finish_stmt_expr.
(push_scope, pop_scope): Remove.
(c99_block_start, compstmt_start): Use c_begin_compound_stmt.
(c99_block_end, compstmt): Use c_end_compound_stmt.
(c99_block_lineno_labeled_stmt): Likewise.
(compstmt_primary_start): Use c_begin_stmt_expr.
(simple_if, select_or_iter_stmt): Update calls to stmt builders.
(do_stmt_start): Fill in body directly.
(lineno_stmt): Avoid setting lineno on constants.
* c-pretty-print.c (pp_c_statement): Handle STATEMENT_LIST.
Remove SCOPE_STMT.
* c-semantics.c (begin_stmt_tree): Remove.
(push_stmt_list, re_push_stmt_list, pop_stmt_list): New.
(add_stmt): Use statement lists.
(add_scope_stmt, finish_stmt_tree): Remove.
(push_cleanup): New.
* c-tree.h: Move some decls from c-common.h.
* c-typeck.c (c_tree_expr_nonnegative_p): Simplify for statement lists.
(do_case, c_finish_case): Likewise.
(c_finish_then): Take body for then as argument.
(c_finish_else): Similarly.
(c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): New.
(c_begin_stmt_expr, c_finish_stmt_expr): New.
(c_begin_compound_stmt): Do scope management.
(c_end_compound_stmt): New.
* fold-const.c (tree_expr_nonnegative_p): Fix BIND_EXPR.
* gimplify.c (voidify_wrapper_expr): Accept temporary argument.
Look through exception handling constructs.
(gimplify_bind_expr): Accept temporary argument.
(gimplify_target_expr): Special case BIND_EXPR bodies.
(gimplify_expr): Handle fallback == fb_none like a statement.
* langhooks-def.h (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Kill.
* langhooks.c (lhd_tree_inlining_tree_chain_matters_p): Remove.
* langhooks.h (tree_chain_matters_p): Remove.
* stub-objc.c (objc_clear_super_receiver): New.
* tree-gimple.h (voidify_wrapper_expr): Update decl.
(append_to_statement_list, append_to_statement_list_force): Move
to tree-iterator.h.
* tree-inline.c (expand_call_inline): Update call.
(clone_body): Use statement lists.
(walk_tree): Don't check tree_chain_matters_p.
(copy_tree_r): Likewise.
* tree-iterator.c (alloc_stmt_list): Clear lang bits.
(tsi_link_before, tsi_link_after): Set TREE_SIDE_EFFECTS properly.
* tree-iterator.h (append_to_statement_list,
append_to_statement_list_force): Moved from tree-gimple.h.
* tree-pretty-print.c (dump_generic_node): Clean up TARGET_EXPR dump.
* objc/objc-act.c (build_module_descriptor): Use c_begin_compound_stmt.
(objc_enter_block): Likewise.
(objc_exit_block): Use c_end_compound_stmt.
(objc_build_try_enter_fragment): Add #error and comment for
rewriting for OBJCPLUS.
(objc_build_extract_fragment, objc_build_try_epilogue,
objc_build_catch_stmt, objc_build_finally_prologue,
objc_build_finally_epilogue): Update for C statement builders.
* objc/objc-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P):
Remove.
cp/
* call.c (initialize_reference): Don't build CLEANUP_STMT here.
* cp-gimplify.c (cp_gimplify_stmt): Remove next_p argument.
(genericize_try_block): Use gimplify_stmt.
(genericize_catch_block, genericize_eh_spec_block): Likewise.
(cp_gimplify_init_expr): Remove STMT_EXPR special case.
(gimplify_must_not_throw_expr): Update voidify_wrapper_expr call.
* cp-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
(cp_tree_chain_matters_p): Remove.
* cp-tree.h (COMPOUND_STMT_TRY_BLOCK): New.
(COMPOUND_STMT_BODY_BLOCK): New.
(STATEMENT_LIST_NO_SCOPE, STATEMENT_LIST_TRY_BLOCK): New.
(EXPR_STMT_STMT_EXPR_RESULT): New.
(building_stmt_tree): Check cur_stmt_list.
(tf_stmt_expr_cmpd, tf_stmt_expr_body): Remove.
(BCS_NO_SCOPE, BCS_TRY_BLOCK, BCS_FN_BODY): New.
* decl.c (poplevel): Use pop_stmt_list for minding cleanups.
(cp_finish_decl): Use push_cleanup.
(start_function, finish_function): Use statement lists.
(finish_stmt): Do nothing.
* except.c (begin_eh_spec_block): Use statement lists.
(check_handlers_1, check_handlers): Likewise.
* init.c (construct_virtual_base): Don't add extra compound stmts.
(build_vec_init): Likewise.
* name-lookup.c (maybe_push_cleanup_level): Use statement lists.
* name-lookup.h (struct cp_binding_level): Add statement_list.
* parser.c (cp_parser_statement): Take the STMT_EXPR node, not a bool.
(cp_parser_labeled_statement, cp_parser_expression_statement,
cp_parser_statement_seq_opt): Likewise.
(cp_parser_compound_statement): Likewise. Take bool for try block.
(cp_parser_selection_statement): Tidy if processing.
(cp_parser_already_scoped_statement): Rewrite to do what it says.
* pt.c (tsubst_copy): Move STMT_EXPR to tsubst_expr.
(tsubst_expr): Rewrite STMT_EXPR processing. Handle STATEMENT_LIST.
Mind COMPOUND_STMT_TRY_BLOCK, EXPR_STMT_STMT_EXPR_RESULT.
* semantics.c (do_poplevel, do_pushlevel): Use statement lists.
(finish_cond): New, rewritten from FINISH_COND.
(simplify_loop_decl_cond): New.
(finish_expr_stmt): Avoid nested EXPR_STMTs.
(begin_if_stmt, finish_if_stmt_cond, finish_then_clause,
begin_else_clause, finish_else_clause, finish_if_stmt,
begin_while_stmt, finish_while_stmt_cond, finish_while_stmt,
begin_do_stmt, finish_do_body, begin_for_stmt, finish_for_init_stmt,
finish_for_cond, finish_for_stmt, begin_switch_stmt,
finish_switch_cond, finish_switch_stmt, begin_try_block,
finish_try_block, finish_cleanup_try_block, finish_function_try_block,
finish_handler_sequence, finish_function_handler_sequence,
begin_handler, finish_handler_parms, finish_handler,
begin_stmt_expr, finish_stmt_expr_expr, finish_stmt_expr): Rewrite
using statement lists.
(begin_compound_stmt): Replace has_no_scope argument with flags.
Update all callers. Use statement lists.
(finish_compound_stmt): Likewise.
(finish_decl_cleanup, finish_eh_cleanup): Use push_cleanup.
(current_scope_stmt_stack): Remove.
(simplify_aggr_init_expr): Don't muck with TREE_CHAIN.
* typeck2.c (split_nonconstant_init_1, split_nonconstant_init):
Rewrite with statement lists.
testsuite/
* g++.dg/ext/stmtexpr1.C: XFAIL.
* gcc.dg/20030612-1.c: XFAIL.
From-SVN: r83221
2004-06-16 03:21:38 +02:00
|
|
|
|
{
|
2004-06-21 11:15:29 +02:00
|
|
|
|
for (i = tsi_start (last); !tsi_one_before_end_p (i); tsi_next (&i))
|
|
|
|
|
|
emit_side_effect_warnings (tsi_stmt (i));
|
c-common.c (lang_gimplify_stmt): Remove next_p argument.
* c-common.c (lang_gimplify_stmt): Remove next_p argument.
(if_elt, if_stack, if_stack_space, c_expand_start_cond, c_finish_then,
c_expand_end_cond, c_expand_start_else, c_finish_else, c_begin_if_stmt,
c_begin_while_stmt, c_finish_while_stmt_cond): Move to c-typeck.c.
(finish_fname_decls, fname_decl): Use statement_lists.
(c_expand_expr_stmt): Don't set last_expr_type.
(c_type_hash): Fix indentation.
(c_safe_from_p): Don't follow TREE_CHAIN.
(c_tree_chain_matters_p): Remove.
* c-common.def (SCOPE_STMT): Remove.
(CLEANUP_STMT): Redefine to contain its own body.
* c-common.h (struct stmt_tree_s): Remove x_last_stmt,
x_last_expr_type, x_last_expr_filename, x_scope_stmt_stack.
Add x_cur_stmt_list.
(last_tree, last_expr_type, last_expr_filename, RECHAIN_STMTS): Remove.
(cur_stmt_list): New.
(STATEMENT_LIST_STMT_EXPR): New.
(SCOPE_BEGIN_P, SCOPE_END_P, SCOPE_STMT_BLOCK, SCOPE_NULLIFIED_P,
SCOPE_NO_CLEANUPS_P, SCOPE_PARTIAL_P, NEW_FOR_SCOPE_P): Remove.
(CLEANUP_BODY): New.
(CLEANUP_DECL): Move to operand 2.
(c_common_stmt_codes): Remove SCOPE_STMT.
(COMPOUND_STMT_NO_SCOPE, COMPOUND_STMT_BODY_BLOCK): Remove.
* c-decl.c (c_scope_stmt_stack, current_scope_stmt_stack): Remove.
(c_push_function_context, c_pop_function_context): Don't save it.
(finish_decl): Set TREE_USED on the decl for a cleanup.
Use push_cleanup.
(store_parm_decls): Use statement lists.
(finish_function): Remove compstmt rule workaround. Use statement
lists. Call finish_fname_decls after finalizing the body.
(c_begin_compound_stmt): Move to c-typeck.c.
* c-dump.c (c_dump_tree): Remove SCOPE_STMT.
* c-gimplify.c (gimplify_cleanup_stmt, gimplify_cleanup_stmts): New.
(c_genericize): Invoke them.
(c_gimplify_stmt): Don't look through TREE_CHAIN. Kill SCOPE_STMT.
(c_build_bind_expr): Export.
(gimplify_block, gimplify_cleanup): Remove.
(gimplify_condition): Use gimplify_stmt.
(gimplify_for_stmt): Remove FOR_INIT_STMT chaining hack.
(gimplify_if_stmt): Remove recursion hack.
(c_gimplify_expr): Remove STMT_EXPR handling.
(stmt_expr_last_stmt, gimplify_stmt_expr): Remove.
(is_last_stmt_of_scope): Remove.
* c-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
* c-mudflap.c (mflang_flush_calls): Use c_begin_compound_stmt,
c_end_compound_stmt.
* c-objc-common.c (build_cdtor): Likewise.
* c-parse.in (primary): Use c_finish_stmt_expr.
(push_scope, pop_scope): Remove.
(c99_block_start, compstmt_start): Use c_begin_compound_stmt.
(c99_block_end, compstmt): Use c_end_compound_stmt.
(c99_block_lineno_labeled_stmt): Likewise.
(compstmt_primary_start): Use c_begin_stmt_expr.
(simple_if, select_or_iter_stmt): Update calls to stmt builders.
(do_stmt_start): Fill in body directly.
(lineno_stmt): Avoid setting lineno on constants.
* c-pretty-print.c (pp_c_statement): Handle STATEMENT_LIST.
Remove SCOPE_STMT.
* c-semantics.c (begin_stmt_tree): Remove.
(push_stmt_list, re_push_stmt_list, pop_stmt_list): New.
(add_stmt): Use statement lists.
(add_scope_stmt, finish_stmt_tree): Remove.
(push_cleanup): New.
* c-tree.h: Move some decls from c-common.h.
* c-typeck.c (c_tree_expr_nonnegative_p): Simplify for statement lists.
(do_case, c_finish_case): Likewise.
(c_finish_then): Take body for then as argument.
(c_finish_else): Similarly.
(c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): New.
(c_begin_stmt_expr, c_finish_stmt_expr): New.
(c_begin_compound_stmt): Do scope management.
(c_end_compound_stmt): New.
* fold-const.c (tree_expr_nonnegative_p): Fix BIND_EXPR.
* gimplify.c (voidify_wrapper_expr): Accept temporary argument.
Look through exception handling constructs.
(gimplify_bind_expr): Accept temporary argument.
(gimplify_target_expr): Special case BIND_EXPR bodies.
(gimplify_expr): Handle fallback == fb_none like a statement.
* langhooks-def.h (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Kill.
* langhooks.c (lhd_tree_inlining_tree_chain_matters_p): Remove.
* langhooks.h (tree_chain_matters_p): Remove.
* stub-objc.c (objc_clear_super_receiver): New.
* tree-gimple.h (voidify_wrapper_expr): Update decl.
(append_to_statement_list, append_to_statement_list_force): Move
to tree-iterator.h.
* tree-inline.c (expand_call_inline): Update call.
(clone_body): Use statement lists.
(walk_tree): Don't check tree_chain_matters_p.
(copy_tree_r): Likewise.
* tree-iterator.c (alloc_stmt_list): Clear lang bits.
(tsi_link_before, tsi_link_after): Set TREE_SIDE_EFFECTS properly.
* tree-iterator.h (append_to_statement_list,
append_to_statement_list_force): Moved from tree-gimple.h.
* tree-pretty-print.c (dump_generic_node): Clean up TARGET_EXPR dump.
* objc/objc-act.c (build_module_descriptor): Use c_begin_compound_stmt.
(objc_enter_block): Likewise.
(objc_exit_block): Use c_end_compound_stmt.
(objc_build_try_enter_fragment): Add #error and comment for
rewriting for OBJCPLUS.
(objc_build_extract_fragment, objc_build_try_epilogue,
objc_build_catch_stmt, objc_build_finally_prologue,
objc_build_finally_epilogue): Update for C statement builders.
* objc/objc-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P):
Remove.
cp/
* call.c (initialize_reference): Don't build CLEANUP_STMT here.
* cp-gimplify.c (cp_gimplify_stmt): Remove next_p argument.
(genericize_try_block): Use gimplify_stmt.
(genericize_catch_block, genericize_eh_spec_block): Likewise.
(cp_gimplify_init_expr): Remove STMT_EXPR special case.
(gimplify_must_not_throw_expr): Update voidify_wrapper_expr call.
* cp-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
(cp_tree_chain_matters_p): Remove.
* cp-tree.h (COMPOUND_STMT_TRY_BLOCK): New.
(COMPOUND_STMT_BODY_BLOCK): New.
(STATEMENT_LIST_NO_SCOPE, STATEMENT_LIST_TRY_BLOCK): New.
(EXPR_STMT_STMT_EXPR_RESULT): New.
(building_stmt_tree): Check cur_stmt_list.
(tf_stmt_expr_cmpd, tf_stmt_expr_body): Remove.
(BCS_NO_SCOPE, BCS_TRY_BLOCK, BCS_FN_BODY): New.
* decl.c (poplevel): Use pop_stmt_list for minding cleanups.
(cp_finish_decl): Use push_cleanup.
(start_function, finish_function): Use statement lists.
(finish_stmt): Do nothing.
* except.c (begin_eh_spec_block): Use statement lists.
(check_handlers_1, check_handlers): Likewise.
* init.c (construct_virtual_base): Don't add extra compound stmts.
(build_vec_init): Likewise.
* name-lookup.c (maybe_push_cleanup_level): Use statement lists.
* name-lookup.h (struct cp_binding_level): Add statement_list.
* parser.c (cp_parser_statement): Take the STMT_EXPR node, not a bool.
(cp_parser_labeled_statement, cp_parser_expression_statement,
cp_parser_statement_seq_opt): Likewise.
(cp_parser_compound_statement): Likewise. Take bool for try block.
(cp_parser_selection_statement): Tidy if processing.
(cp_parser_already_scoped_statement): Rewrite to do what it says.
* pt.c (tsubst_copy): Move STMT_EXPR to tsubst_expr.
(tsubst_expr): Rewrite STMT_EXPR processing. Handle STATEMENT_LIST.
Mind COMPOUND_STMT_TRY_BLOCK, EXPR_STMT_STMT_EXPR_RESULT.
* semantics.c (do_poplevel, do_pushlevel): Use statement lists.
(finish_cond): New, rewritten from FINISH_COND.
(simplify_loop_decl_cond): New.
(finish_expr_stmt): Avoid nested EXPR_STMTs.
(begin_if_stmt, finish_if_stmt_cond, finish_then_clause,
begin_else_clause, finish_else_clause, finish_if_stmt,
begin_while_stmt, finish_while_stmt_cond, finish_while_stmt,
begin_do_stmt, finish_do_body, begin_for_stmt, finish_for_init_stmt,
finish_for_cond, finish_for_stmt, begin_switch_stmt,
finish_switch_cond, finish_switch_stmt, begin_try_block,
finish_try_block, finish_cleanup_try_block, finish_function_try_block,
finish_handler_sequence, finish_function_handler_sequence,
begin_handler, finish_handler_parms, finish_handler,
begin_stmt_expr, finish_stmt_expr_expr, finish_stmt_expr): Rewrite
using statement lists.
(begin_compound_stmt): Replace has_no_scope argument with flags.
Update all callers. Use statement lists.
(finish_compound_stmt): Likewise.
(finish_decl_cleanup, finish_eh_cleanup): Use push_cleanup.
(current_scope_stmt_stack): Remove.
(simplify_aggr_init_expr): Don't muck with TREE_CHAIN.
* typeck2.c (split_nonconstant_init_1, split_nonconstant_init):
Rewrite with statement lists.
testsuite/
* g++.dg/ext/stmtexpr1.C: XFAIL.
* gcc.dg/20030612-1.c: XFAIL.
From-SVN: r83221
2004-06-16 03:21:38 +02:00
|
|
|
|
}
|
|
|
|
|
|
else
|
2004-06-21 11:15:29 +02:00
|
|
|
|
i = tsi_last (last);
|
|
|
|
|
|
last_p = tsi_stmt_ptr (i);
|
|
|
|
|
|
last = *last_p;
|
c-common.c (lang_gimplify_stmt): Remove next_p argument.
* c-common.c (lang_gimplify_stmt): Remove next_p argument.
(if_elt, if_stack, if_stack_space, c_expand_start_cond, c_finish_then,
c_expand_end_cond, c_expand_start_else, c_finish_else, c_begin_if_stmt,
c_begin_while_stmt, c_finish_while_stmt_cond): Move to c-typeck.c.
(finish_fname_decls, fname_decl): Use statement_lists.
(c_expand_expr_stmt): Don't set last_expr_type.
(c_type_hash): Fix indentation.
(c_safe_from_p): Don't follow TREE_CHAIN.
(c_tree_chain_matters_p): Remove.
* c-common.def (SCOPE_STMT): Remove.
(CLEANUP_STMT): Redefine to contain its own body.
* c-common.h (struct stmt_tree_s): Remove x_last_stmt,
x_last_expr_type, x_last_expr_filename, x_scope_stmt_stack.
Add x_cur_stmt_list.
(last_tree, last_expr_type, last_expr_filename, RECHAIN_STMTS): Remove.
(cur_stmt_list): New.
(STATEMENT_LIST_STMT_EXPR): New.
(SCOPE_BEGIN_P, SCOPE_END_P, SCOPE_STMT_BLOCK, SCOPE_NULLIFIED_P,
SCOPE_NO_CLEANUPS_P, SCOPE_PARTIAL_P, NEW_FOR_SCOPE_P): Remove.
(CLEANUP_BODY): New.
(CLEANUP_DECL): Move to operand 2.
(c_common_stmt_codes): Remove SCOPE_STMT.
(COMPOUND_STMT_NO_SCOPE, COMPOUND_STMT_BODY_BLOCK): Remove.
* c-decl.c (c_scope_stmt_stack, current_scope_stmt_stack): Remove.
(c_push_function_context, c_pop_function_context): Don't save it.
(finish_decl): Set TREE_USED on the decl for a cleanup.
Use push_cleanup.
(store_parm_decls): Use statement lists.
(finish_function): Remove compstmt rule workaround. Use statement
lists. Call finish_fname_decls after finalizing the body.
(c_begin_compound_stmt): Move to c-typeck.c.
* c-dump.c (c_dump_tree): Remove SCOPE_STMT.
* c-gimplify.c (gimplify_cleanup_stmt, gimplify_cleanup_stmts): New.
(c_genericize): Invoke them.
(c_gimplify_stmt): Don't look through TREE_CHAIN. Kill SCOPE_STMT.
(c_build_bind_expr): Export.
(gimplify_block, gimplify_cleanup): Remove.
(gimplify_condition): Use gimplify_stmt.
(gimplify_for_stmt): Remove FOR_INIT_STMT chaining hack.
(gimplify_if_stmt): Remove recursion hack.
(c_gimplify_expr): Remove STMT_EXPR handling.
(stmt_expr_last_stmt, gimplify_stmt_expr): Remove.
(is_last_stmt_of_scope): Remove.
* c-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
* c-mudflap.c (mflang_flush_calls): Use c_begin_compound_stmt,
c_end_compound_stmt.
* c-objc-common.c (build_cdtor): Likewise.
* c-parse.in (primary): Use c_finish_stmt_expr.
(push_scope, pop_scope): Remove.
(c99_block_start, compstmt_start): Use c_begin_compound_stmt.
(c99_block_end, compstmt): Use c_end_compound_stmt.
(c99_block_lineno_labeled_stmt): Likewise.
(compstmt_primary_start): Use c_begin_stmt_expr.
(simple_if, select_or_iter_stmt): Update calls to stmt builders.
(do_stmt_start): Fill in body directly.
(lineno_stmt): Avoid setting lineno on constants.
* c-pretty-print.c (pp_c_statement): Handle STATEMENT_LIST.
Remove SCOPE_STMT.
* c-semantics.c (begin_stmt_tree): Remove.
(push_stmt_list, re_push_stmt_list, pop_stmt_list): New.
(add_stmt): Use statement lists.
(add_scope_stmt, finish_stmt_tree): Remove.
(push_cleanup): New.
* c-tree.h: Move some decls from c-common.h.
* c-typeck.c (c_tree_expr_nonnegative_p): Simplify for statement lists.
(do_case, c_finish_case): Likewise.
(c_finish_then): Take body for then as argument.
(c_finish_else): Similarly.
(c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): New.
(c_begin_stmt_expr, c_finish_stmt_expr): New.
(c_begin_compound_stmt): Do scope management.
(c_end_compound_stmt): New.
* fold-const.c (tree_expr_nonnegative_p): Fix BIND_EXPR.
* gimplify.c (voidify_wrapper_expr): Accept temporary argument.
Look through exception handling constructs.
(gimplify_bind_expr): Accept temporary argument.
(gimplify_target_expr): Special case BIND_EXPR bodies.
(gimplify_expr): Handle fallback == fb_none like a statement.
* langhooks-def.h (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Kill.
* langhooks.c (lhd_tree_inlining_tree_chain_matters_p): Remove.
* langhooks.h (tree_chain_matters_p): Remove.
* stub-objc.c (objc_clear_super_receiver): New.
* tree-gimple.h (voidify_wrapper_expr): Update decl.
(append_to_statement_list, append_to_statement_list_force): Move
to tree-iterator.h.
* tree-inline.c (expand_call_inline): Update call.
(clone_body): Use statement lists.
(walk_tree): Don't check tree_chain_matters_p.
(copy_tree_r): Likewise.
* tree-iterator.c (alloc_stmt_list): Clear lang bits.
(tsi_link_before, tsi_link_after): Set TREE_SIDE_EFFECTS properly.
* tree-iterator.h (append_to_statement_list,
append_to_statement_list_force): Moved from tree-gimple.h.
* tree-pretty-print.c (dump_generic_node): Clean up TARGET_EXPR dump.
* objc/objc-act.c (build_module_descriptor): Use c_begin_compound_stmt.
(objc_enter_block): Likewise.
(objc_exit_block): Use c_end_compound_stmt.
(objc_build_try_enter_fragment): Add #error and comment for
rewriting for OBJCPLUS.
(objc_build_extract_fragment, objc_build_try_epilogue,
objc_build_catch_stmt, objc_build_finally_prologue,
objc_build_finally_epilogue): Update for C statement builders.
* objc/objc-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P):
Remove.
cp/
* call.c (initialize_reference): Don't build CLEANUP_STMT here.
* cp-gimplify.c (cp_gimplify_stmt): Remove next_p argument.
(genericize_try_block): Use gimplify_stmt.
(genericize_catch_block, genericize_eh_spec_block): Likewise.
(cp_gimplify_init_expr): Remove STMT_EXPR special case.
(gimplify_must_not_throw_expr): Update voidify_wrapper_expr call.
* cp-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
(cp_tree_chain_matters_p): Remove.
* cp-tree.h (COMPOUND_STMT_TRY_BLOCK): New.
(COMPOUND_STMT_BODY_BLOCK): New.
(STATEMENT_LIST_NO_SCOPE, STATEMENT_LIST_TRY_BLOCK): New.
(EXPR_STMT_STMT_EXPR_RESULT): New.
(building_stmt_tree): Check cur_stmt_list.
(tf_stmt_expr_cmpd, tf_stmt_expr_body): Remove.
(BCS_NO_SCOPE, BCS_TRY_BLOCK, BCS_FN_BODY): New.
* decl.c (poplevel): Use pop_stmt_list for minding cleanups.
(cp_finish_decl): Use push_cleanup.
(start_function, finish_function): Use statement lists.
(finish_stmt): Do nothing.
* except.c (begin_eh_spec_block): Use statement lists.
(check_handlers_1, check_handlers): Likewise.
* init.c (construct_virtual_base): Don't add extra compound stmts.
(build_vec_init): Likewise.
* name-lookup.c (maybe_push_cleanup_level): Use statement lists.
* name-lookup.h (struct cp_binding_level): Add statement_list.
* parser.c (cp_parser_statement): Take the STMT_EXPR node, not a bool.
(cp_parser_labeled_statement, cp_parser_expression_statement,
cp_parser_statement_seq_opt): Likewise.
(cp_parser_compound_statement): Likewise. Take bool for try block.
(cp_parser_selection_statement): Tidy if processing.
(cp_parser_already_scoped_statement): Rewrite to do what it says.
* pt.c (tsubst_copy): Move STMT_EXPR to tsubst_expr.
(tsubst_expr): Rewrite STMT_EXPR processing. Handle STATEMENT_LIST.
Mind COMPOUND_STMT_TRY_BLOCK, EXPR_STMT_STMT_EXPR_RESULT.
* semantics.c (do_poplevel, do_pushlevel): Use statement lists.
(finish_cond): New, rewritten from FINISH_COND.
(simplify_loop_decl_cond): New.
(finish_expr_stmt): Avoid nested EXPR_STMTs.
(begin_if_stmt, finish_if_stmt_cond, finish_then_clause,
begin_else_clause, finish_else_clause, finish_if_stmt,
begin_while_stmt, finish_while_stmt_cond, finish_while_stmt,
begin_do_stmt, finish_do_body, begin_for_stmt, finish_for_init_stmt,
finish_for_cond, finish_for_stmt, begin_switch_stmt,
finish_switch_cond, finish_switch_stmt, begin_try_block,
finish_try_block, finish_cleanup_try_block, finish_function_try_block,
finish_handler_sequence, finish_function_handler_sequence,
begin_handler, finish_handler_parms, finish_handler,
begin_stmt_expr, finish_stmt_expr_expr, finish_stmt_expr): Rewrite
using statement lists.
(begin_compound_stmt): Replace has_no_scope argument with flags.
Update all callers. Use statement lists.
(finish_compound_stmt): Likewise.
(finish_decl_cleanup, finish_eh_cleanup): Use push_cleanup.
(current_scope_stmt_stack): Remove.
(simplify_aggr_init_expr): Don't muck with TREE_CHAIN.
* typeck2.c (split_nonconstant_init_1, split_nonconstant_init):
Rewrite with statement lists.
testsuite/
* g++.dg/ext/stmtexpr1.C: XFAIL.
* gcc.dg/20030612-1.c: XFAIL.
From-SVN: r83221
2004-06-16 03:21:38 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
2004-06-21 11:15:29 +02:00
|
|
|
|
/* If the end of the list is exception related, then the list was split
|
|
|
|
|
|
by a call to push_cleanup. Continue searching. */
|
|
|
|
|
|
if (TREE_CODE (last) == TRY_FINALLY_EXPR
|
|
|
|
|
|
|| TREE_CODE (last) == TRY_CATCH_EXPR)
|
|
|
|
|
|
{
|
|
|
|
|
|
last_p = &TREE_OPERAND (last, 0);
|
|
|
|
|
|
last = *last_p;
|
|
|
|
|
|
goto continue_searching;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* In the case that the BIND_EXPR is not necessary, return the
|
|
|
|
|
|
expression out from inside it. */
|
2004-06-23 04:33:25 +02:00
|
|
|
|
if (last == error_mark_node
|
|
|
|
|
|
|| (last == BIND_EXPR_BODY (body)
|
|
|
|
|
|
&& BIND_EXPR_VARS (body) == NULL))
|
2004-06-21 11:15:29 +02:00
|
|
|
|
return last;
|
c-common.c (lang_gimplify_stmt): Remove next_p argument.
* c-common.c (lang_gimplify_stmt): Remove next_p argument.
(if_elt, if_stack, if_stack_space, c_expand_start_cond, c_finish_then,
c_expand_end_cond, c_expand_start_else, c_finish_else, c_begin_if_stmt,
c_begin_while_stmt, c_finish_while_stmt_cond): Move to c-typeck.c.
(finish_fname_decls, fname_decl): Use statement_lists.
(c_expand_expr_stmt): Don't set last_expr_type.
(c_type_hash): Fix indentation.
(c_safe_from_p): Don't follow TREE_CHAIN.
(c_tree_chain_matters_p): Remove.
* c-common.def (SCOPE_STMT): Remove.
(CLEANUP_STMT): Redefine to contain its own body.
* c-common.h (struct stmt_tree_s): Remove x_last_stmt,
x_last_expr_type, x_last_expr_filename, x_scope_stmt_stack.
Add x_cur_stmt_list.
(last_tree, last_expr_type, last_expr_filename, RECHAIN_STMTS): Remove.
(cur_stmt_list): New.
(STATEMENT_LIST_STMT_EXPR): New.
(SCOPE_BEGIN_P, SCOPE_END_P, SCOPE_STMT_BLOCK, SCOPE_NULLIFIED_P,
SCOPE_NO_CLEANUPS_P, SCOPE_PARTIAL_P, NEW_FOR_SCOPE_P): Remove.
(CLEANUP_BODY): New.
(CLEANUP_DECL): Move to operand 2.
(c_common_stmt_codes): Remove SCOPE_STMT.
(COMPOUND_STMT_NO_SCOPE, COMPOUND_STMT_BODY_BLOCK): Remove.
* c-decl.c (c_scope_stmt_stack, current_scope_stmt_stack): Remove.
(c_push_function_context, c_pop_function_context): Don't save it.
(finish_decl): Set TREE_USED on the decl for a cleanup.
Use push_cleanup.
(store_parm_decls): Use statement lists.
(finish_function): Remove compstmt rule workaround. Use statement
lists. Call finish_fname_decls after finalizing the body.
(c_begin_compound_stmt): Move to c-typeck.c.
* c-dump.c (c_dump_tree): Remove SCOPE_STMT.
* c-gimplify.c (gimplify_cleanup_stmt, gimplify_cleanup_stmts): New.
(c_genericize): Invoke them.
(c_gimplify_stmt): Don't look through TREE_CHAIN. Kill SCOPE_STMT.
(c_build_bind_expr): Export.
(gimplify_block, gimplify_cleanup): Remove.
(gimplify_condition): Use gimplify_stmt.
(gimplify_for_stmt): Remove FOR_INIT_STMT chaining hack.
(gimplify_if_stmt): Remove recursion hack.
(c_gimplify_expr): Remove STMT_EXPR handling.
(stmt_expr_last_stmt, gimplify_stmt_expr): Remove.
(is_last_stmt_of_scope): Remove.
* c-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
* c-mudflap.c (mflang_flush_calls): Use c_begin_compound_stmt,
c_end_compound_stmt.
* c-objc-common.c (build_cdtor): Likewise.
* c-parse.in (primary): Use c_finish_stmt_expr.
(push_scope, pop_scope): Remove.
(c99_block_start, compstmt_start): Use c_begin_compound_stmt.
(c99_block_end, compstmt): Use c_end_compound_stmt.
(c99_block_lineno_labeled_stmt): Likewise.
(compstmt_primary_start): Use c_begin_stmt_expr.
(simple_if, select_or_iter_stmt): Update calls to stmt builders.
(do_stmt_start): Fill in body directly.
(lineno_stmt): Avoid setting lineno on constants.
* c-pretty-print.c (pp_c_statement): Handle STATEMENT_LIST.
Remove SCOPE_STMT.
* c-semantics.c (begin_stmt_tree): Remove.
(push_stmt_list, re_push_stmt_list, pop_stmt_list): New.
(add_stmt): Use statement lists.
(add_scope_stmt, finish_stmt_tree): Remove.
(push_cleanup): New.
* c-tree.h: Move some decls from c-common.h.
* c-typeck.c (c_tree_expr_nonnegative_p): Simplify for statement lists.
(do_case, c_finish_case): Likewise.
(c_finish_then): Take body for then as argument.
(c_finish_else): Similarly.
(c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): New.
(c_begin_stmt_expr, c_finish_stmt_expr): New.
(c_begin_compound_stmt): Do scope management.
(c_end_compound_stmt): New.
* fold-const.c (tree_expr_nonnegative_p): Fix BIND_EXPR.
* gimplify.c (voidify_wrapper_expr): Accept temporary argument.
Look through exception handling constructs.
(gimplify_bind_expr): Accept temporary argument.
(gimplify_target_expr): Special case BIND_EXPR bodies.
(gimplify_expr): Handle fallback == fb_none like a statement.
* langhooks-def.h (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Kill.
* langhooks.c (lhd_tree_inlining_tree_chain_matters_p): Remove.
* langhooks.h (tree_chain_matters_p): Remove.
* stub-objc.c (objc_clear_super_receiver): New.
* tree-gimple.h (voidify_wrapper_expr): Update decl.
(append_to_statement_list, append_to_statement_list_force): Move
to tree-iterator.h.
* tree-inline.c (expand_call_inline): Update call.
(clone_body): Use statement lists.
(walk_tree): Don't check tree_chain_matters_p.
(copy_tree_r): Likewise.
* tree-iterator.c (alloc_stmt_list): Clear lang bits.
(tsi_link_before, tsi_link_after): Set TREE_SIDE_EFFECTS properly.
* tree-iterator.h (append_to_statement_list,
append_to_statement_list_force): Moved from tree-gimple.h.
* tree-pretty-print.c (dump_generic_node): Clean up TARGET_EXPR dump.
* objc/objc-act.c (build_module_descriptor): Use c_begin_compound_stmt.
(objc_enter_block): Likewise.
(objc_exit_block): Use c_end_compound_stmt.
(objc_build_try_enter_fragment): Add #error and comment for
rewriting for OBJCPLUS.
(objc_build_extract_fragment, objc_build_try_epilogue,
objc_build_catch_stmt, objc_build_finally_prologue,
objc_build_finally_epilogue): Update for C statement builders.
* objc/objc-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P):
Remove.
cp/
* call.c (initialize_reference): Don't build CLEANUP_STMT here.
* cp-gimplify.c (cp_gimplify_stmt): Remove next_p argument.
(genericize_try_block): Use gimplify_stmt.
(genericize_catch_block, genericize_eh_spec_block): Likewise.
(cp_gimplify_init_expr): Remove STMT_EXPR special case.
(gimplify_must_not_throw_expr): Update voidify_wrapper_expr call.
* cp-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
(cp_tree_chain_matters_p): Remove.
* cp-tree.h (COMPOUND_STMT_TRY_BLOCK): New.
(COMPOUND_STMT_BODY_BLOCK): New.
(STATEMENT_LIST_NO_SCOPE, STATEMENT_LIST_TRY_BLOCK): New.
(EXPR_STMT_STMT_EXPR_RESULT): New.
(building_stmt_tree): Check cur_stmt_list.
(tf_stmt_expr_cmpd, tf_stmt_expr_body): Remove.
(BCS_NO_SCOPE, BCS_TRY_BLOCK, BCS_FN_BODY): New.
* decl.c (poplevel): Use pop_stmt_list for minding cleanups.
(cp_finish_decl): Use push_cleanup.
(start_function, finish_function): Use statement lists.
(finish_stmt): Do nothing.
* except.c (begin_eh_spec_block): Use statement lists.
(check_handlers_1, check_handlers): Likewise.
* init.c (construct_virtual_base): Don't add extra compound stmts.
(build_vec_init): Likewise.
* name-lookup.c (maybe_push_cleanup_level): Use statement lists.
* name-lookup.h (struct cp_binding_level): Add statement_list.
* parser.c (cp_parser_statement): Take the STMT_EXPR node, not a bool.
(cp_parser_labeled_statement, cp_parser_expression_statement,
cp_parser_statement_seq_opt): Likewise.
(cp_parser_compound_statement): Likewise. Take bool for try block.
(cp_parser_selection_statement): Tidy if processing.
(cp_parser_already_scoped_statement): Rewrite to do what it says.
* pt.c (tsubst_copy): Move STMT_EXPR to tsubst_expr.
(tsubst_expr): Rewrite STMT_EXPR processing. Handle STATEMENT_LIST.
Mind COMPOUND_STMT_TRY_BLOCK, EXPR_STMT_STMT_EXPR_RESULT.
* semantics.c (do_poplevel, do_pushlevel): Use statement lists.
(finish_cond): New, rewritten from FINISH_COND.
(simplify_loop_decl_cond): New.
(finish_expr_stmt): Avoid nested EXPR_STMTs.
(begin_if_stmt, finish_if_stmt_cond, finish_then_clause,
begin_else_clause, finish_else_clause, finish_if_stmt,
begin_while_stmt, finish_while_stmt_cond, finish_while_stmt,
begin_do_stmt, finish_do_body, begin_for_stmt, finish_for_init_stmt,
finish_for_cond, finish_for_stmt, begin_switch_stmt,
finish_switch_cond, finish_switch_stmt, begin_try_block,
finish_try_block, finish_cleanup_try_block, finish_function_try_block,
finish_handler_sequence, finish_function_handler_sequence,
begin_handler, finish_handler_parms, finish_handler,
begin_stmt_expr, finish_stmt_expr_expr, finish_stmt_expr): Rewrite
using statement lists.
(begin_compound_stmt): Replace has_no_scope argument with flags.
Update all callers. Use statement lists.
(finish_compound_stmt): Likewise.
(finish_decl_cleanup, finish_eh_cleanup): Use push_cleanup.
(current_scope_stmt_stack): Remove.
(simplify_aggr_init_expr): Don't muck with TREE_CHAIN.
* typeck2.c (split_nonconstant_init_1, split_nonconstant_init):
Rewrite with statement lists.
testsuite/
* g++.dg/ext/stmtexpr1.C: XFAIL.
* gcc.dg/20030612-1.c: XFAIL.
From-SVN: r83221
2004-06-16 03:21:38 +02:00
|
|
|
|
|
|
|
|
|
|
/* Extract the type of said expression. */
|
|
|
|
|
|
type = TREE_TYPE (last);
|
|
|
|
|
|
|
2004-06-21 11:15:29 +02:00
|
|
|
|
/* If we're not returning a value at all, then the BIND_EXPR that
|
|
|
|
|
|
we already have is a fine expression to return. */
|
|
|
|
|
|
if (!type || VOID_TYPE_P (type))
|
|
|
|
|
|
return body;
|
|
|
|
|
|
|
|
|
|
|
|
/* Now that we've located the expression containing the value, it seems
|
|
|
|
|
|
silly to make voidify_wrapper_expr repeat the process. Create a
|
|
|
|
|
|
temporary of the appropriate type and stick it in a TARGET_EXPR. */
|
|
|
|
|
|
tmp = create_tmp_var_raw (type, NULL);
|
|
|
|
|
|
|
|
|
|
|
|
/* Unwrap a no-op NOP_EXPR as added by c_finish_expr_stmt. This avoids
|
|
|
|
|
|
tree_expr_nonnegative_p giving up immediately. */
|
|
|
|
|
|
val = last;
|
|
|
|
|
|
if (TREE_CODE (val) == NOP_EXPR
|
|
|
|
|
|
&& TREE_TYPE (val) == TREE_TYPE (TREE_OPERAND (val, 0)))
|
|
|
|
|
|
val = TREE_OPERAND (val, 0);
|
|
|
|
|
|
|
|
|
|
|
|
*last_p = build (MODIFY_EXPR, void_type_node, tmp, val);
|
|
|
|
|
|
SET_EXPR_LOCUS (*last_p, EXPR_LOCUS (last));
|
|
|
|
|
|
|
|
|
|
|
|
return build (TARGET_EXPR, type, tmp, body, NULL_TREE, NULL_TREE);
|
c-common.c (lang_gimplify_stmt): Remove next_p argument.
* c-common.c (lang_gimplify_stmt): Remove next_p argument.
(if_elt, if_stack, if_stack_space, c_expand_start_cond, c_finish_then,
c_expand_end_cond, c_expand_start_else, c_finish_else, c_begin_if_stmt,
c_begin_while_stmt, c_finish_while_stmt_cond): Move to c-typeck.c.
(finish_fname_decls, fname_decl): Use statement_lists.
(c_expand_expr_stmt): Don't set last_expr_type.
(c_type_hash): Fix indentation.
(c_safe_from_p): Don't follow TREE_CHAIN.
(c_tree_chain_matters_p): Remove.
* c-common.def (SCOPE_STMT): Remove.
(CLEANUP_STMT): Redefine to contain its own body.
* c-common.h (struct stmt_tree_s): Remove x_last_stmt,
x_last_expr_type, x_last_expr_filename, x_scope_stmt_stack.
Add x_cur_stmt_list.
(last_tree, last_expr_type, last_expr_filename, RECHAIN_STMTS): Remove.
(cur_stmt_list): New.
(STATEMENT_LIST_STMT_EXPR): New.
(SCOPE_BEGIN_P, SCOPE_END_P, SCOPE_STMT_BLOCK, SCOPE_NULLIFIED_P,
SCOPE_NO_CLEANUPS_P, SCOPE_PARTIAL_P, NEW_FOR_SCOPE_P): Remove.
(CLEANUP_BODY): New.
(CLEANUP_DECL): Move to operand 2.
(c_common_stmt_codes): Remove SCOPE_STMT.
(COMPOUND_STMT_NO_SCOPE, COMPOUND_STMT_BODY_BLOCK): Remove.
* c-decl.c (c_scope_stmt_stack, current_scope_stmt_stack): Remove.
(c_push_function_context, c_pop_function_context): Don't save it.
(finish_decl): Set TREE_USED on the decl for a cleanup.
Use push_cleanup.
(store_parm_decls): Use statement lists.
(finish_function): Remove compstmt rule workaround. Use statement
lists. Call finish_fname_decls after finalizing the body.
(c_begin_compound_stmt): Move to c-typeck.c.
* c-dump.c (c_dump_tree): Remove SCOPE_STMT.
* c-gimplify.c (gimplify_cleanup_stmt, gimplify_cleanup_stmts): New.
(c_genericize): Invoke them.
(c_gimplify_stmt): Don't look through TREE_CHAIN. Kill SCOPE_STMT.
(c_build_bind_expr): Export.
(gimplify_block, gimplify_cleanup): Remove.
(gimplify_condition): Use gimplify_stmt.
(gimplify_for_stmt): Remove FOR_INIT_STMT chaining hack.
(gimplify_if_stmt): Remove recursion hack.
(c_gimplify_expr): Remove STMT_EXPR handling.
(stmt_expr_last_stmt, gimplify_stmt_expr): Remove.
(is_last_stmt_of_scope): Remove.
* c-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
* c-mudflap.c (mflang_flush_calls): Use c_begin_compound_stmt,
c_end_compound_stmt.
* c-objc-common.c (build_cdtor): Likewise.
* c-parse.in (primary): Use c_finish_stmt_expr.
(push_scope, pop_scope): Remove.
(c99_block_start, compstmt_start): Use c_begin_compound_stmt.
(c99_block_end, compstmt): Use c_end_compound_stmt.
(c99_block_lineno_labeled_stmt): Likewise.
(compstmt_primary_start): Use c_begin_stmt_expr.
(simple_if, select_or_iter_stmt): Update calls to stmt builders.
(do_stmt_start): Fill in body directly.
(lineno_stmt): Avoid setting lineno on constants.
* c-pretty-print.c (pp_c_statement): Handle STATEMENT_LIST.
Remove SCOPE_STMT.
* c-semantics.c (begin_stmt_tree): Remove.
(push_stmt_list, re_push_stmt_list, pop_stmt_list): New.
(add_stmt): Use statement lists.
(add_scope_stmt, finish_stmt_tree): Remove.
(push_cleanup): New.
* c-tree.h: Move some decls from c-common.h.
* c-typeck.c (c_tree_expr_nonnegative_p): Simplify for statement lists.
(do_case, c_finish_case): Likewise.
(c_finish_then): Take body for then as argument.
(c_finish_else): Similarly.
(c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): New.
(c_begin_stmt_expr, c_finish_stmt_expr): New.
(c_begin_compound_stmt): Do scope management.
(c_end_compound_stmt): New.
* fold-const.c (tree_expr_nonnegative_p): Fix BIND_EXPR.
* gimplify.c (voidify_wrapper_expr): Accept temporary argument.
Look through exception handling constructs.
(gimplify_bind_expr): Accept temporary argument.
(gimplify_target_expr): Special case BIND_EXPR bodies.
(gimplify_expr): Handle fallback == fb_none like a statement.
* langhooks-def.h (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Kill.
* langhooks.c (lhd_tree_inlining_tree_chain_matters_p): Remove.
* langhooks.h (tree_chain_matters_p): Remove.
* stub-objc.c (objc_clear_super_receiver): New.
* tree-gimple.h (voidify_wrapper_expr): Update decl.
(append_to_statement_list, append_to_statement_list_force): Move
to tree-iterator.h.
* tree-inline.c (expand_call_inline): Update call.
(clone_body): Use statement lists.
(walk_tree): Don't check tree_chain_matters_p.
(copy_tree_r): Likewise.
* tree-iterator.c (alloc_stmt_list): Clear lang bits.
(tsi_link_before, tsi_link_after): Set TREE_SIDE_EFFECTS properly.
* tree-iterator.h (append_to_statement_list,
append_to_statement_list_force): Moved from tree-gimple.h.
* tree-pretty-print.c (dump_generic_node): Clean up TARGET_EXPR dump.
* objc/objc-act.c (build_module_descriptor): Use c_begin_compound_stmt.
(objc_enter_block): Likewise.
(objc_exit_block): Use c_end_compound_stmt.
(objc_build_try_enter_fragment): Add #error and comment for
rewriting for OBJCPLUS.
(objc_build_extract_fragment, objc_build_try_epilogue,
objc_build_catch_stmt, objc_build_finally_prologue,
objc_build_finally_epilogue): Update for C statement builders.
* objc/objc-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P):
Remove.
cp/
* call.c (initialize_reference): Don't build CLEANUP_STMT here.
* cp-gimplify.c (cp_gimplify_stmt): Remove next_p argument.
(genericize_try_block): Use gimplify_stmt.
(genericize_catch_block, genericize_eh_spec_block): Likewise.
(cp_gimplify_init_expr): Remove STMT_EXPR special case.
(gimplify_must_not_throw_expr): Update voidify_wrapper_expr call.
* cp-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
(cp_tree_chain_matters_p): Remove.
* cp-tree.h (COMPOUND_STMT_TRY_BLOCK): New.
(COMPOUND_STMT_BODY_BLOCK): New.
(STATEMENT_LIST_NO_SCOPE, STATEMENT_LIST_TRY_BLOCK): New.
(EXPR_STMT_STMT_EXPR_RESULT): New.
(building_stmt_tree): Check cur_stmt_list.
(tf_stmt_expr_cmpd, tf_stmt_expr_body): Remove.
(BCS_NO_SCOPE, BCS_TRY_BLOCK, BCS_FN_BODY): New.
* decl.c (poplevel): Use pop_stmt_list for minding cleanups.
(cp_finish_decl): Use push_cleanup.
(start_function, finish_function): Use statement lists.
(finish_stmt): Do nothing.
* except.c (begin_eh_spec_block): Use statement lists.
(check_handlers_1, check_handlers): Likewise.
* init.c (construct_virtual_base): Don't add extra compound stmts.
(build_vec_init): Likewise.
* name-lookup.c (maybe_push_cleanup_level): Use statement lists.
* name-lookup.h (struct cp_binding_level): Add statement_list.
* parser.c (cp_parser_statement): Take the STMT_EXPR node, not a bool.
(cp_parser_labeled_statement, cp_parser_expression_statement,
cp_parser_statement_seq_opt): Likewise.
(cp_parser_compound_statement): Likewise. Take bool for try block.
(cp_parser_selection_statement): Tidy if processing.
(cp_parser_already_scoped_statement): Rewrite to do what it says.
* pt.c (tsubst_copy): Move STMT_EXPR to tsubst_expr.
(tsubst_expr): Rewrite STMT_EXPR processing. Handle STATEMENT_LIST.
Mind COMPOUND_STMT_TRY_BLOCK, EXPR_STMT_STMT_EXPR_RESULT.
* semantics.c (do_poplevel, do_pushlevel): Use statement lists.
(finish_cond): New, rewritten from FINISH_COND.
(simplify_loop_decl_cond): New.
(finish_expr_stmt): Avoid nested EXPR_STMTs.
(begin_if_stmt, finish_if_stmt_cond, finish_then_clause,
begin_else_clause, finish_else_clause, finish_if_stmt,
begin_while_stmt, finish_while_stmt_cond, finish_while_stmt,
begin_do_stmt, finish_do_body, begin_for_stmt, finish_for_init_stmt,
finish_for_cond, finish_for_stmt, begin_switch_stmt,
finish_switch_cond, finish_switch_stmt, begin_try_block,
finish_try_block, finish_cleanup_try_block, finish_function_try_block,
finish_handler_sequence, finish_function_handler_sequence,
begin_handler, finish_handler_parms, finish_handler,
begin_stmt_expr, finish_stmt_expr_expr, finish_stmt_expr): Rewrite
using statement lists.
(begin_compound_stmt): Replace has_no_scope argument with flags.
Update all callers. Use statement lists.
(finish_compound_stmt): Likewise.
(finish_decl_cleanup, finish_eh_cleanup): Use push_cleanup.
(current_scope_stmt_stack): Remove.
(simplify_aggr_init_expr): Don't muck with TREE_CHAIN.
* typeck2.c (split_nonconstant_init_1, split_nonconstant_init):
Rewrite with statement lists.
testsuite/
* g++.dg/ext/stmtexpr1.C: XFAIL.
* gcc.dg/20030612-1.c: XFAIL.
From-SVN: r83221
2004-06-16 03:21:38 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Begin and end compound statements. This is as simple as pushing
|
|
|
|
|
|
and popping new statement lists from the tree. */
|
|
|
|
|
|
|
|
|
|
|
|
tree
|
|
|
|
|
|
c_begin_compound_stmt (bool do_scope)
|
|
|
|
|
|
{
|
|
|
|
|
|
tree stmt = push_stmt_list ();
|
|
|
|
|
|
if (do_scope)
|
tree.def (RTL_EXPR): Remove.
* tree.def (RTL_EXPR): Remove.
* c-typeck.c (lvalue_p): Don't handle it.
* expr.c (safe_from_p): Likewise.
(expand_expr_real_1): Likewise.
* fold-const.c (non_lvalue, operand_equal_p, fold): Likewise.
(fold_checksum_tree, tree_expr_nonnegative_p): Likewise.
* gengtype.c (adjust_field_tree_exp): Likewise.
* stmt.c (warn_if_unused_value): Likewise.
* tree-gimple.c (recalculate_side_effects): Likewise.
* tree-pretty-print.c (dump_generic_node): Likewise.
* tree.c (make_node_stat, first_rtl_op, unsave_expr_1): Likewise.
(unsafe_for_reeval, stabilize_reference, build1_stat): Likewise.
* tree.h (RTL_EXPR_SEQUENCE, RTL_EXPR_RTL, RTL_EXPR_ALT_RTL): Remove.
* stmt.c (struct stmt_status): Remove x_last_expr_type,
x_last_expr_value, x_last_expr_alt_rtl, x_expr_stmts_for_value.
(last_expr_type, last_expr_value, last_expr_alt_rtl): Remove.
(expand_expr_stmt): Merge with expand_expr_stmt_value. Remove
all the bits that tracked last_expr.
(expand_end_bindings): Don't track last_expr.
(expand_start_stmt_expr, expand_end_stmt_expr): Remove.
(clear_last_expr): Remove.
(expand_asm): Don't call it.
(expand_asm_operands, expand_end_cond): Likewise.
(expand_naked_return, expand_null_return_1): Likewise.
* c-typeck.c (c_begin_compound_stmt): Likewise.
* cfgexpand.c (expand_block): Use expand_expr_stmt.
* expr.c (expand_expr_real_1): Likewise.
* tree.h: Update prototypes.
* function.h (struct sequence_stack): Remove sequence_rtl_expr.
(struct emit_status): Remove sequence_rtl_expr.
(struct function): Remove x_rtl_expr_chain.
(seq_rtl_expr, rtl_expr_chain): Remove.
* function.c (struct temp_slot): Remove rtl_expr.
(assign_stack_temp_for_type): Don't set it.
(free_temp_slots, pop_temp_slots): Don't check it.
(free_after_compilation): Don't clear x_rtl_expr_chain.
(fixup_var_refs): Don't search it.
(preserve_rtl_expr_result, free_temps_for_rtl_expr): Remove.
* emit-rtl.c (start_sequence): Don't use sequence_rtl_expr
or seq_rtl_expr.
(push_topmost_sequence): Likewise.
(end_sequence, init_emit): Likewise.
(start_sequence_for_rtl_expr): Remove.
* expmed.c (make_tree): Build a VAR_DECL instead of an RTL_EXPR.
* rtl.h (preserve_rtl_expr_result): Remove.
ada/
* trans.c (gnat_stabilize_reference): Don't handle RTL_EXPR.
* utils.c (max_size): Likewise.
cp/
* class.c (fixed_type_or_null): Don't handle RTL_EXPR.
* method.c (synthesize_method): Don't clear_last_expr.
* name-lookup.c (maybe_push_cleanup_level): Likewise.
From-SVN: r84009
2004-07-02 03:15:43 +02:00
|
|
|
|
push_scope ();
|
c-common.c (lang_gimplify_stmt): Remove next_p argument.
* c-common.c (lang_gimplify_stmt): Remove next_p argument.
(if_elt, if_stack, if_stack_space, c_expand_start_cond, c_finish_then,
c_expand_end_cond, c_expand_start_else, c_finish_else, c_begin_if_stmt,
c_begin_while_stmt, c_finish_while_stmt_cond): Move to c-typeck.c.
(finish_fname_decls, fname_decl): Use statement_lists.
(c_expand_expr_stmt): Don't set last_expr_type.
(c_type_hash): Fix indentation.
(c_safe_from_p): Don't follow TREE_CHAIN.
(c_tree_chain_matters_p): Remove.
* c-common.def (SCOPE_STMT): Remove.
(CLEANUP_STMT): Redefine to contain its own body.
* c-common.h (struct stmt_tree_s): Remove x_last_stmt,
x_last_expr_type, x_last_expr_filename, x_scope_stmt_stack.
Add x_cur_stmt_list.
(last_tree, last_expr_type, last_expr_filename, RECHAIN_STMTS): Remove.
(cur_stmt_list): New.
(STATEMENT_LIST_STMT_EXPR): New.
(SCOPE_BEGIN_P, SCOPE_END_P, SCOPE_STMT_BLOCK, SCOPE_NULLIFIED_P,
SCOPE_NO_CLEANUPS_P, SCOPE_PARTIAL_P, NEW_FOR_SCOPE_P): Remove.
(CLEANUP_BODY): New.
(CLEANUP_DECL): Move to operand 2.
(c_common_stmt_codes): Remove SCOPE_STMT.
(COMPOUND_STMT_NO_SCOPE, COMPOUND_STMT_BODY_BLOCK): Remove.
* c-decl.c (c_scope_stmt_stack, current_scope_stmt_stack): Remove.
(c_push_function_context, c_pop_function_context): Don't save it.
(finish_decl): Set TREE_USED on the decl for a cleanup.
Use push_cleanup.
(store_parm_decls): Use statement lists.
(finish_function): Remove compstmt rule workaround. Use statement
lists. Call finish_fname_decls after finalizing the body.
(c_begin_compound_stmt): Move to c-typeck.c.
* c-dump.c (c_dump_tree): Remove SCOPE_STMT.
* c-gimplify.c (gimplify_cleanup_stmt, gimplify_cleanup_stmts): New.
(c_genericize): Invoke them.
(c_gimplify_stmt): Don't look through TREE_CHAIN. Kill SCOPE_STMT.
(c_build_bind_expr): Export.
(gimplify_block, gimplify_cleanup): Remove.
(gimplify_condition): Use gimplify_stmt.
(gimplify_for_stmt): Remove FOR_INIT_STMT chaining hack.
(gimplify_if_stmt): Remove recursion hack.
(c_gimplify_expr): Remove STMT_EXPR handling.
(stmt_expr_last_stmt, gimplify_stmt_expr): Remove.
(is_last_stmt_of_scope): Remove.
* c-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
* c-mudflap.c (mflang_flush_calls): Use c_begin_compound_stmt,
c_end_compound_stmt.
* c-objc-common.c (build_cdtor): Likewise.
* c-parse.in (primary): Use c_finish_stmt_expr.
(push_scope, pop_scope): Remove.
(c99_block_start, compstmt_start): Use c_begin_compound_stmt.
(c99_block_end, compstmt): Use c_end_compound_stmt.
(c99_block_lineno_labeled_stmt): Likewise.
(compstmt_primary_start): Use c_begin_stmt_expr.
(simple_if, select_or_iter_stmt): Update calls to stmt builders.
(do_stmt_start): Fill in body directly.
(lineno_stmt): Avoid setting lineno on constants.
* c-pretty-print.c (pp_c_statement): Handle STATEMENT_LIST.
Remove SCOPE_STMT.
* c-semantics.c (begin_stmt_tree): Remove.
(push_stmt_list, re_push_stmt_list, pop_stmt_list): New.
(add_stmt): Use statement lists.
(add_scope_stmt, finish_stmt_tree): Remove.
(push_cleanup): New.
* c-tree.h: Move some decls from c-common.h.
* c-typeck.c (c_tree_expr_nonnegative_p): Simplify for statement lists.
(do_case, c_finish_case): Likewise.
(c_finish_then): Take body for then as argument.
(c_finish_else): Similarly.
(c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): New.
(c_begin_stmt_expr, c_finish_stmt_expr): New.
(c_begin_compound_stmt): Do scope management.
(c_end_compound_stmt): New.
* fold-const.c (tree_expr_nonnegative_p): Fix BIND_EXPR.
* gimplify.c (voidify_wrapper_expr): Accept temporary argument.
Look through exception handling constructs.
(gimplify_bind_expr): Accept temporary argument.
(gimplify_target_expr): Special case BIND_EXPR bodies.
(gimplify_expr): Handle fallback == fb_none like a statement.
* langhooks-def.h (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Kill.
* langhooks.c (lhd_tree_inlining_tree_chain_matters_p): Remove.
* langhooks.h (tree_chain_matters_p): Remove.
* stub-objc.c (objc_clear_super_receiver): New.
* tree-gimple.h (voidify_wrapper_expr): Update decl.
(append_to_statement_list, append_to_statement_list_force): Move
to tree-iterator.h.
* tree-inline.c (expand_call_inline): Update call.
(clone_body): Use statement lists.
(walk_tree): Don't check tree_chain_matters_p.
(copy_tree_r): Likewise.
* tree-iterator.c (alloc_stmt_list): Clear lang bits.
(tsi_link_before, tsi_link_after): Set TREE_SIDE_EFFECTS properly.
* tree-iterator.h (append_to_statement_list,
append_to_statement_list_force): Moved from tree-gimple.h.
* tree-pretty-print.c (dump_generic_node): Clean up TARGET_EXPR dump.
* objc/objc-act.c (build_module_descriptor): Use c_begin_compound_stmt.
(objc_enter_block): Likewise.
(objc_exit_block): Use c_end_compound_stmt.
(objc_build_try_enter_fragment): Add #error and comment for
rewriting for OBJCPLUS.
(objc_build_extract_fragment, objc_build_try_epilogue,
objc_build_catch_stmt, objc_build_finally_prologue,
objc_build_finally_epilogue): Update for C statement builders.
* objc/objc-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P):
Remove.
cp/
* call.c (initialize_reference): Don't build CLEANUP_STMT here.
* cp-gimplify.c (cp_gimplify_stmt): Remove next_p argument.
(genericize_try_block): Use gimplify_stmt.
(genericize_catch_block, genericize_eh_spec_block): Likewise.
(cp_gimplify_init_expr): Remove STMT_EXPR special case.
(gimplify_must_not_throw_expr): Update voidify_wrapper_expr call.
* cp-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
(cp_tree_chain_matters_p): Remove.
* cp-tree.h (COMPOUND_STMT_TRY_BLOCK): New.
(COMPOUND_STMT_BODY_BLOCK): New.
(STATEMENT_LIST_NO_SCOPE, STATEMENT_LIST_TRY_BLOCK): New.
(EXPR_STMT_STMT_EXPR_RESULT): New.
(building_stmt_tree): Check cur_stmt_list.
(tf_stmt_expr_cmpd, tf_stmt_expr_body): Remove.
(BCS_NO_SCOPE, BCS_TRY_BLOCK, BCS_FN_BODY): New.
* decl.c (poplevel): Use pop_stmt_list for minding cleanups.
(cp_finish_decl): Use push_cleanup.
(start_function, finish_function): Use statement lists.
(finish_stmt): Do nothing.
* except.c (begin_eh_spec_block): Use statement lists.
(check_handlers_1, check_handlers): Likewise.
* init.c (construct_virtual_base): Don't add extra compound stmts.
(build_vec_init): Likewise.
* name-lookup.c (maybe_push_cleanup_level): Use statement lists.
* name-lookup.h (struct cp_binding_level): Add statement_list.
* parser.c (cp_parser_statement): Take the STMT_EXPR node, not a bool.
(cp_parser_labeled_statement, cp_parser_expression_statement,
cp_parser_statement_seq_opt): Likewise.
(cp_parser_compound_statement): Likewise. Take bool for try block.
(cp_parser_selection_statement): Tidy if processing.
(cp_parser_already_scoped_statement): Rewrite to do what it says.
* pt.c (tsubst_copy): Move STMT_EXPR to tsubst_expr.
(tsubst_expr): Rewrite STMT_EXPR processing. Handle STATEMENT_LIST.
Mind COMPOUND_STMT_TRY_BLOCK, EXPR_STMT_STMT_EXPR_RESULT.
* semantics.c (do_poplevel, do_pushlevel): Use statement lists.
(finish_cond): New, rewritten from FINISH_COND.
(simplify_loop_decl_cond): New.
(finish_expr_stmt): Avoid nested EXPR_STMTs.
(begin_if_stmt, finish_if_stmt_cond, finish_then_clause,
begin_else_clause, finish_else_clause, finish_if_stmt,
begin_while_stmt, finish_while_stmt_cond, finish_while_stmt,
begin_do_stmt, finish_do_body, begin_for_stmt, finish_for_init_stmt,
finish_for_cond, finish_for_stmt, begin_switch_stmt,
finish_switch_cond, finish_switch_stmt, begin_try_block,
finish_try_block, finish_cleanup_try_block, finish_function_try_block,
finish_handler_sequence, finish_function_handler_sequence,
begin_handler, finish_handler_parms, finish_handler,
begin_stmt_expr, finish_stmt_expr_expr, finish_stmt_expr): Rewrite
using statement lists.
(begin_compound_stmt): Replace has_no_scope argument with flags.
Update all callers. Use statement lists.
(finish_compound_stmt): Likewise.
(finish_decl_cleanup, finish_eh_cleanup): Use push_cleanup.
(current_scope_stmt_stack): Remove.
(simplify_aggr_init_expr): Don't muck with TREE_CHAIN.
* typeck2.c (split_nonconstant_init_1, split_nonconstant_init):
Rewrite with statement lists.
testsuite/
* g++.dg/ext/stmtexpr1.C: XFAIL.
* gcc.dg/20030612-1.c: XFAIL.
From-SVN: r83221
2004-06-16 03:21:38 +02:00
|
|
|
|
return stmt;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
tree
|
|
|
|
|
|
c_end_compound_stmt (tree stmt, bool do_scope)
|
|
|
|
|
|
{
|
|
|
|
|
|
tree block = NULL;
|
|
|
|
|
|
|
|
|
|
|
|
if (do_scope)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (c_dialect_objc ())
|
|
|
|
|
|
objc_clear_super_receiver ();
|
|
|
|
|
|
block = pop_scope ();
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
stmt = pop_stmt_list (stmt);
|
|
|
|
|
|
stmt = c_build_bind_expr (block, stmt);
|
|
|
|
|
|
|
|
|
|
|
|
/* If this compound statement is nested immediately inside a statement
|
|
|
|
|
|
expression, then force a BIND_EXPR to be created. Otherwise we'll
|
|
|
|
|
|
do the wrong thing for ({ { 1; } }) or ({ 1; { } }). In particular,
|
|
|
|
|
|
STATEMENT_LISTs merge, and thus we can lose track of what statement
|
|
|
|
|
|
was really last. */
|
|
|
|
|
|
if (cur_stmt_list
|
|
|
|
|
|
&& STATEMENT_LIST_STMT_EXPR (cur_stmt_list)
|
|
|
|
|
|
&& TREE_CODE (stmt) != BIND_EXPR)
|
|
|
|
|
|
{
|
|
|
|
|
|
stmt = build (BIND_EXPR, void_type_node, NULL, stmt, NULL);
|
|
|
|
|
|
TREE_SIDE_EFFECTS (stmt) = 1;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return stmt;
|
|
|
|
|
|
}
|
c-common.def (IF_STMT, [...]): Move to cp-tree.def.
* c-common.def (IF_STMT, CLEANUP_STMT): Move to cp-tree.def.
* c-common.h (IF_COND, THEN_CLAUSE, ELSE_CLAUSE, CLEANUP_BODY,
CLEANUP_EXPR, CLEANUP_DECL): Move to cp-tree.h.
(c_common_stmt_codes): Remove IF_STMT, CLEANUP_STMT.
* c-dump.c (c_dump_tree): Move IF_STMT, CLEANUP_STMT to cp_dump_tree.
* c-pretty-print.c (pp_c_statement): Similarly.
* c-gimplify.c (gimplify_cleanup_stmt, gimplify_cleanup_stmts,
gimplify_if_stmt): Move to cp-gimplify.c.
(c_genericize, c_gimplify_expr): Don't call them.
* c-semantics.c (push_cleanup): Move to cp/semantics.c.
* c-typeck.c (push_cleanup): New.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_finish_else,
c_finish_if_stmt): Use COND_EXPR.
* tree.h (CLEANUP_EH_ONLY): Update documentation.
cp/
* cp-tree.def (CLEANUP_STMT, IF_STMT): Move from c-common.def.
* cp-gimplify.c (gimplify_if_stmt): Move from c-gimplify.c.
(cp_gimplify_expr): Call it.
(gimplify_cleanup_stmt): Move from c-gimplify.c.
(cp_genericize): New.
* decl.c (finish_function): Call it.
* cp-tree.h (cp_stmt_codes): Add CLEANUP_STMT, IF_STMT.
(CLEANUP_BODY, CLEANUP_EXPR, CLEANUP_DECL): Move from c-common.h.
(IF_COND, THEN_CLAUSE, ELSE_CLAUSE): Likewise.
(cp_genericize): Declare.
* cxx-pretty-print.c (pp_cxx_statement): Add CLEANUP_STMT, IF_STMT.
* dump.c (cp_dump_tree): Likewise.
* semantics.c (push_cleanup): Move from c-semantics.c.
From-SVN: r83407
2004-06-20 11:18:13 +02:00
|
|
|
|
|
|
|
|
|
|
/* Queue a cleanup. CLEANUP is an expression/statement to be executed
|
|
|
|
|
|
when the current scope is exited. EH_ONLY is true when this is not
|
|
|
|
|
|
meant to apply to normal control flow transfer. */
|
|
|
|
|
|
|
|
|
|
|
|
void
|
2004-07-25 02:13:01 +02:00
|
|
|
|
push_cleanup (tree ARG_UNUSED (decl), tree cleanup, bool eh_only)
|
c-common.def (IF_STMT, [...]): Move to cp-tree.def.
* c-common.def (IF_STMT, CLEANUP_STMT): Move to cp-tree.def.
* c-common.h (IF_COND, THEN_CLAUSE, ELSE_CLAUSE, CLEANUP_BODY,
CLEANUP_EXPR, CLEANUP_DECL): Move to cp-tree.h.
(c_common_stmt_codes): Remove IF_STMT, CLEANUP_STMT.
* c-dump.c (c_dump_tree): Move IF_STMT, CLEANUP_STMT to cp_dump_tree.
* c-pretty-print.c (pp_c_statement): Similarly.
* c-gimplify.c (gimplify_cleanup_stmt, gimplify_cleanup_stmts,
gimplify_if_stmt): Move to cp-gimplify.c.
(c_genericize, c_gimplify_expr): Don't call them.
* c-semantics.c (push_cleanup): Move to cp/semantics.c.
* c-typeck.c (push_cleanup): New.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_finish_else,
c_finish_if_stmt): Use COND_EXPR.
* tree.h (CLEANUP_EH_ONLY): Update documentation.
cp/
* cp-tree.def (CLEANUP_STMT, IF_STMT): Move from c-common.def.
* cp-gimplify.c (gimplify_if_stmt): Move from c-gimplify.c.
(cp_gimplify_expr): Call it.
(gimplify_cleanup_stmt): Move from c-gimplify.c.
(cp_genericize): New.
* decl.c (finish_function): Call it.
* cp-tree.h (cp_stmt_codes): Add CLEANUP_STMT, IF_STMT.
(CLEANUP_BODY, CLEANUP_EXPR, CLEANUP_DECL): Move from c-common.h.
(IF_COND, THEN_CLAUSE, ELSE_CLAUSE): Likewise.
(cp_genericize): Declare.
* cxx-pretty-print.c (pp_cxx_statement): Add CLEANUP_STMT, IF_STMT.
* dump.c (cp_dump_tree): Likewise.
* semantics.c (push_cleanup): Move from c-semantics.c.
From-SVN: r83407
2004-06-20 11:18:13 +02:00
|
|
|
|
{
|
2004-06-21 11:15:29 +02:00
|
|
|
|
enum tree_code code;
|
|
|
|
|
|
tree stmt, list;
|
|
|
|
|
|
bool stmt_expr;
|
|
|
|
|
|
|
|
|
|
|
|
code = eh_only ? TRY_CATCH_EXPR : TRY_FINALLY_EXPR;
|
|
|
|
|
|
stmt = build_stmt (code, NULL, cleanup);
|
c-common.def (IF_STMT, [...]): Move to cp-tree.def.
* c-common.def (IF_STMT, CLEANUP_STMT): Move to cp-tree.def.
* c-common.h (IF_COND, THEN_CLAUSE, ELSE_CLAUSE, CLEANUP_BODY,
CLEANUP_EXPR, CLEANUP_DECL): Move to cp-tree.h.
(c_common_stmt_codes): Remove IF_STMT, CLEANUP_STMT.
* c-dump.c (c_dump_tree): Move IF_STMT, CLEANUP_STMT to cp_dump_tree.
* c-pretty-print.c (pp_c_statement): Similarly.
* c-gimplify.c (gimplify_cleanup_stmt, gimplify_cleanup_stmts,
gimplify_if_stmt): Move to cp-gimplify.c.
(c_genericize, c_gimplify_expr): Don't call them.
* c-semantics.c (push_cleanup): Move to cp/semantics.c.
* c-typeck.c (push_cleanup): New.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_finish_else,
c_finish_if_stmt): Use COND_EXPR.
* tree.h (CLEANUP_EH_ONLY): Update documentation.
cp/
* cp-tree.def (CLEANUP_STMT, IF_STMT): Move from c-common.def.
* cp-gimplify.c (gimplify_if_stmt): Move from c-gimplify.c.
(cp_gimplify_expr): Call it.
(gimplify_cleanup_stmt): Move from c-gimplify.c.
(cp_genericize): New.
* decl.c (finish_function): Call it.
* cp-tree.h (cp_stmt_codes): Add CLEANUP_STMT, IF_STMT.
(CLEANUP_BODY, CLEANUP_EXPR, CLEANUP_DECL): Move from c-common.h.
(IF_COND, THEN_CLAUSE, ELSE_CLAUSE): Likewise.
(cp_genericize): Declare.
* cxx-pretty-print.c (pp_cxx_statement): Add CLEANUP_STMT, IF_STMT.
* dump.c (cp_dump_tree): Likewise.
* semantics.c (push_cleanup): Move from c-semantics.c.
From-SVN: r83407
2004-06-20 11:18:13 +02:00
|
|
|
|
add_stmt (stmt);
|
2004-06-21 11:15:29 +02:00
|
|
|
|
stmt_expr = STATEMENT_LIST_STMT_EXPR (cur_stmt_list);
|
|
|
|
|
|
list = push_stmt_list ();
|
|
|
|
|
|
TREE_OPERAND (stmt, 0) = list;
|
|
|
|
|
|
STATEMENT_LIST_STMT_EXPR (list) = stmt_expr;
|
c-common.def (IF_STMT, [...]): Move to cp-tree.def.
* c-common.def (IF_STMT, CLEANUP_STMT): Move to cp-tree.def.
* c-common.h (IF_COND, THEN_CLAUSE, ELSE_CLAUSE, CLEANUP_BODY,
CLEANUP_EXPR, CLEANUP_DECL): Move to cp-tree.h.
(c_common_stmt_codes): Remove IF_STMT, CLEANUP_STMT.
* c-dump.c (c_dump_tree): Move IF_STMT, CLEANUP_STMT to cp_dump_tree.
* c-pretty-print.c (pp_c_statement): Similarly.
* c-gimplify.c (gimplify_cleanup_stmt, gimplify_cleanup_stmts,
gimplify_if_stmt): Move to cp-gimplify.c.
(c_genericize, c_gimplify_expr): Don't call them.
* c-semantics.c (push_cleanup): Move to cp/semantics.c.
* c-typeck.c (push_cleanup): New.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_finish_else,
c_finish_if_stmt): Use COND_EXPR.
* tree.h (CLEANUP_EH_ONLY): Update documentation.
cp/
* cp-tree.def (CLEANUP_STMT, IF_STMT): Move from c-common.def.
* cp-gimplify.c (gimplify_if_stmt): Move from c-gimplify.c.
(cp_gimplify_expr): Call it.
(gimplify_cleanup_stmt): Move from c-gimplify.c.
(cp_genericize): New.
* decl.c (finish_function): Call it.
* cp-tree.h (cp_stmt_codes): Add CLEANUP_STMT, IF_STMT.
(CLEANUP_BODY, CLEANUP_EXPR, CLEANUP_DECL): Move from c-common.h.
(IF_COND, THEN_CLAUSE, ELSE_CLAUSE): Likewise.
(cp_genericize): Declare.
* cxx-pretty-print.c (pp_cxx_statement): Add CLEANUP_STMT, IF_STMT.
* dump.c (cp_dump_tree): Likewise.
* semantics.c (push_cleanup): Move from c-semantics.c.
From-SVN: r83407
2004-06-20 11:18:13 +02:00
|
|
|
|
}
|
c-common.c (lang_gimplify_stmt): Remove next_p argument.
* c-common.c (lang_gimplify_stmt): Remove next_p argument.
(if_elt, if_stack, if_stack_space, c_expand_start_cond, c_finish_then,
c_expand_end_cond, c_expand_start_else, c_finish_else, c_begin_if_stmt,
c_begin_while_stmt, c_finish_while_stmt_cond): Move to c-typeck.c.
(finish_fname_decls, fname_decl): Use statement_lists.
(c_expand_expr_stmt): Don't set last_expr_type.
(c_type_hash): Fix indentation.
(c_safe_from_p): Don't follow TREE_CHAIN.
(c_tree_chain_matters_p): Remove.
* c-common.def (SCOPE_STMT): Remove.
(CLEANUP_STMT): Redefine to contain its own body.
* c-common.h (struct stmt_tree_s): Remove x_last_stmt,
x_last_expr_type, x_last_expr_filename, x_scope_stmt_stack.
Add x_cur_stmt_list.
(last_tree, last_expr_type, last_expr_filename, RECHAIN_STMTS): Remove.
(cur_stmt_list): New.
(STATEMENT_LIST_STMT_EXPR): New.
(SCOPE_BEGIN_P, SCOPE_END_P, SCOPE_STMT_BLOCK, SCOPE_NULLIFIED_P,
SCOPE_NO_CLEANUPS_P, SCOPE_PARTIAL_P, NEW_FOR_SCOPE_P): Remove.
(CLEANUP_BODY): New.
(CLEANUP_DECL): Move to operand 2.
(c_common_stmt_codes): Remove SCOPE_STMT.
(COMPOUND_STMT_NO_SCOPE, COMPOUND_STMT_BODY_BLOCK): Remove.
* c-decl.c (c_scope_stmt_stack, current_scope_stmt_stack): Remove.
(c_push_function_context, c_pop_function_context): Don't save it.
(finish_decl): Set TREE_USED on the decl for a cleanup.
Use push_cleanup.
(store_parm_decls): Use statement lists.
(finish_function): Remove compstmt rule workaround. Use statement
lists. Call finish_fname_decls after finalizing the body.
(c_begin_compound_stmt): Move to c-typeck.c.
* c-dump.c (c_dump_tree): Remove SCOPE_STMT.
* c-gimplify.c (gimplify_cleanup_stmt, gimplify_cleanup_stmts): New.
(c_genericize): Invoke them.
(c_gimplify_stmt): Don't look through TREE_CHAIN. Kill SCOPE_STMT.
(c_build_bind_expr): Export.
(gimplify_block, gimplify_cleanup): Remove.
(gimplify_condition): Use gimplify_stmt.
(gimplify_for_stmt): Remove FOR_INIT_STMT chaining hack.
(gimplify_if_stmt): Remove recursion hack.
(c_gimplify_expr): Remove STMT_EXPR handling.
(stmt_expr_last_stmt, gimplify_stmt_expr): Remove.
(is_last_stmt_of_scope): Remove.
* c-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
* c-mudflap.c (mflang_flush_calls): Use c_begin_compound_stmt,
c_end_compound_stmt.
* c-objc-common.c (build_cdtor): Likewise.
* c-parse.in (primary): Use c_finish_stmt_expr.
(push_scope, pop_scope): Remove.
(c99_block_start, compstmt_start): Use c_begin_compound_stmt.
(c99_block_end, compstmt): Use c_end_compound_stmt.
(c99_block_lineno_labeled_stmt): Likewise.
(compstmt_primary_start): Use c_begin_stmt_expr.
(simple_if, select_or_iter_stmt): Update calls to stmt builders.
(do_stmt_start): Fill in body directly.
(lineno_stmt): Avoid setting lineno on constants.
* c-pretty-print.c (pp_c_statement): Handle STATEMENT_LIST.
Remove SCOPE_STMT.
* c-semantics.c (begin_stmt_tree): Remove.
(push_stmt_list, re_push_stmt_list, pop_stmt_list): New.
(add_stmt): Use statement lists.
(add_scope_stmt, finish_stmt_tree): Remove.
(push_cleanup): New.
* c-tree.h: Move some decls from c-common.h.
* c-typeck.c (c_tree_expr_nonnegative_p): Simplify for statement lists.
(do_case, c_finish_case): Likewise.
(c_finish_then): Take body for then as argument.
(c_finish_else): Similarly.
(c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): New.
(c_begin_stmt_expr, c_finish_stmt_expr): New.
(c_begin_compound_stmt): Do scope management.
(c_end_compound_stmt): New.
* fold-const.c (tree_expr_nonnegative_p): Fix BIND_EXPR.
* gimplify.c (voidify_wrapper_expr): Accept temporary argument.
Look through exception handling constructs.
(gimplify_bind_expr): Accept temporary argument.
(gimplify_target_expr): Special case BIND_EXPR bodies.
(gimplify_expr): Handle fallback == fb_none like a statement.
* langhooks-def.h (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Kill.
* langhooks.c (lhd_tree_inlining_tree_chain_matters_p): Remove.
* langhooks.h (tree_chain_matters_p): Remove.
* stub-objc.c (objc_clear_super_receiver): New.
* tree-gimple.h (voidify_wrapper_expr): Update decl.
(append_to_statement_list, append_to_statement_list_force): Move
to tree-iterator.h.
* tree-inline.c (expand_call_inline): Update call.
(clone_body): Use statement lists.
(walk_tree): Don't check tree_chain_matters_p.
(copy_tree_r): Likewise.
* tree-iterator.c (alloc_stmt_list): Clear lang bits.
(tsi_link_before, tsi_link_after): Set TREE_SIDE_EFFECTS properly.
* tree-iterator.h (append_to_statement_list,
append_to_statement_list_force): Moved from tree-gimple.h.
* tree-pretty-print.c (dump_generic_node): Clean up TARGET_EXPR dump.
* objc/objc-act.c (build_module_descriptor): Use c_begin_compound_stmt.
(objc_enter_block): Likewise.
(objc_exit_block): Use c_end_compound_stmt.
(objc_build_try_enter_fragment): Add #error and comment for
rewriting for OBJCPLUS.
(objc_build_extract_fragment, objc_build_try_epilogue,
objc_build_catch_stmt, objc_build_finally_prologue,
objc_build_finally_epilogue): Update for C statement builders.
* objc/objc-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P):
Remove.
cp/
* call.c (initialize_reference): Don't build CLEANUP_STMT here.
* cp-gimplify.c (cp_gimplify_stmt): Remove next_p argument.
(genericize_try_block): Use gimplify_stmt.
(genericize_catch_block, genericize_eh_spec_block): Likewise.
(cp_gimplify_init_expr): Remove STMT_EXPR special case.
(gimplify_must_not_throw_expr): Update voidify_wrapper_expr call.
* cp-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
(cp_tree_chain_matters_p): Remove.
* cp-tree.h (COMPOUND_STMT_TRY_BLOCK): New.
(COMPOUND_STMT_BODY_BLOCK): New.
(STATEMENT_LIST_NO_SCOPE, STATEMENT_LIST_TRY_BLOCK): New.
(EXPR_STMT_STMT_EXPR_RESULT): New.
(building_stmt_tree): Check cur_stmt_list.
(tf_stmt_expr_cmpd, tf_stmt_expr_body): Remove.
(BCS_NO_SCOPE, BCS_TRY_BLOCK, BCS_FN_BODY): New.
* decl.c (poplevel): Use pop_stmt_list for minding cleanups.
(cp_finish_decl): Use push_cleanup.
(start_function, finish_function): Use statement lists.
(finish_stmt): Do nothing.
* except.c (begin_eh_spec_block): Use statement lists.
(check_handlers_1, check_handlers): Likewise.
* init.c (construct_virtual_base): Don't add extra compound stmts.
(build_vec_init): Likewise.
* name-lookup.c (maybe_push_cleanup_level): Use statement lists.
* name-lookup.h (struct cp_binding_level): Add statement_list.
* parser.c (cp_parser_statement): Take the STMT_EXPR node, not a bool.
(cp_parser_labeled_statement, cp_parser_expression_statement,
cp_parser_statement_seq_opt): Likewise.
(cp_parser_compound_statement): Likewise. Take bool for try block.
(cp_parser_selection_statement): Tidy if processing.
(cp_parser_already_scoped_statement): Rewrite to do what it says.
* pt.c (tsubst_copy): Move STMT_EXPR to tsubst_expr.
(tsubst_expr): Rewrite STMT_EXPR processing. Handle STATEMENT_LIST.
Mind COMPOUND_STMT_TRY_BLOCK, EXPR_STMT_STMT_EXPR_RESULT.
* semantics.c (do_poplevel, do_pushlevel): Use statement lists.
(finish_cond): New, rewritten from FINISH_COND.
(simplify_loop_decl_cond): New.
(finish_expr_stmt): Avoid nested EXPR_STMTs.
(begin_if_stmt, finish_if_stmt_cond, finish_then_clause,
begin_else_clause, finish_else_clause, finish_if_stmt,
begin_while_stmt, finish_while_stmt_cond, finish_while_stmt,
begin_do_stmt, finish_do_body, begin_for_stmt, finish_for_init_stmt,
finish_for_cond, finish_for_stmt, begin_switch_stmt,
finish_switch_cond, finish_switch_stmt, begin_try_block,
finish_try_block, finish_cleanup_try_block, finish_function_try_block,
finish_handler_sequence, finish_function_handler_sequence,
begin_handler, finish_handler_parms, finish_handler,
begin_stmt_expr, finish_stmt_expr_expr, finish_stmt_expr): Rewrite
using statement lists.
(begin_compound_stmt): Replace has_no_scope argument with flags.
Update all callers. Use statement lists.
(finish_compound_stmt): Likewise.
(finish_decl_cleanup, finish_eh_cleanup): Use push_cleanup.
(current_scope_stmt_stack): Remove.
(simplify_aggr_init_expr): Don't muck with TREE_CHAIN.
* typeck2.c (split_nonconstant_init_1, split_nonconstant_init):
Rewrite with statement lists.
testsuite/
* g++.dg/ext/stmtexpr1.C: XFAIL.
* gcc.dg/20030612-1.c: XFAIL.
From-SVN: r83221
2004-06-16 03:21:38 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Build a binary-operation expression without default conversions.
|
|
|
|
|
|
CODE is the kind of expression to build.
|
|
|
|
|
|
This function differs from `build' in several ways:
|
|
|
|
|
|
the data type of the result is computed and recorded in it,
|
|
|
|
|
|
warnings are generated if arg data types are invalid,
|
|
|
|
|
|
special handling for addition and subtraction of pointers is known,
|
|
|
|
|
|
and some optimization is done (operations on narrow ints
|
|
|
|
|
|
are done in the narrower type when that gives the same result).
|
|
|
|
|
|
Constant folding is also done before the result is returned.
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
Note that the operands will never have enumeral types, or function
|
|
|
|
|
|
or array types, because either they will have the default conversions
|
|
|
|
|
|
performed or they have both just been converted to some other type in which
|
|
|
|
|
|
the arithmetic is to be done. */
|
|
|
|
|
|
|
|
|
|
|
|
tree
|
|
|
|
|
|
build_binary_op (enum tree_code code, tree orig_op0, tree orig_op1,
|
|
|
|
|
|
int convert_p)
|
1993-07-23 20:49:55 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
tree type0, type1;
|
|
|
|
|
|
enum tree_code code0, code1;
|
|
|
|
|
|
tree op0, op1;
|
1993-07-27 07:57:26 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Expression code to give to the expression when it is built.
|
|
|
|
|
|
Normally this is CODE, which is what the caller asked for,
|
|
|
|
|
|
but in some special cases we change it. */
|
|
|
|
|
|
enum tree_code resultcode = code;
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Data type in which the computation is to be performed.
|
|
|
|
|
|
In the simplest cases this is the common type of the arguments. */
|
|
|
|
|
|
tree result_type = NULL;
|
|
|
|
|
|
|
|
|
|
|
|
/* Nonzero means operands have already been type-converted
|
|
|
|
|
|
in whatever way is necessary.
|
|
|
|
|
|
Zero means they need to be converted to RESULT_TYPE. */
|
|
|
|
|
|
int converted = 0;
|
|
|
|
|
|
|
|
|
|
|
|
/* Nonzero means create the expression with this type, rather than
|
|
|
|
|
|
RESULT_TYPE. */
|
|
|
|
|
|
tree build_type = 0;
|
|
|
|
|
|
|
|
|
|
|
|
/* Nonzero means after finally constructing the expression
|
|
|
|
|
|
convert it to this type. */
|
|
|
|
|
|
tree final_type = 0;
|
|
|
|
|
|
|
|
|
|
|
|
/* Nonzero if this is an operation like MIN or MAX which can
|
|
|
|
|
|
safely be computed in short if both args are promoted shorts.
|
|
|
|
|
|
Also implies COMMON.
|
|
|
|
|
|
-1 indicates a bitwise operation; this makes a difference
|
|
|
|
|
|
in the exact conditions for when it is safe to do the operation
|
|
|
|
|
|
in a narrower mode. */
|
|
|
|
|
|
int shorten = 0;
|
|
|
|
|
|
|
|
|
|
|
|
/* Nonzero if this is a comparison operation;
|
|
|
|
|
|
if both args are promoted shorts, compare the original shorts.
|
|
|
|
|
|
Also implies COMMON. */
|
|
|
|
|
|
int short_compare = 0;
|
|
|
|
|
|
|
|
|
|
|
|
/* Nonzero if this is a right-shift operation, which can be computed on the
|
|
|
|
|
|
original short and then promoted if the operand is a promoted short. */
|
|
|
|
|
|
int short_shift = 0;
|
|
|
|
|
|
|
|
|
|
|
|
/* Nonzero means set RESULT_TYPE to the common type of the args. */
|
|
|
|
|
|
int common = 0;
|
|
|
|
|
|
|
|
|
|
|
|
if (convert_p)
|
1993-07-30 08:52:04 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
op0 = default_conversion (orig_op0);
|
|
|
|
|
|
op1 = default_conversion (orig_op1);
|
1993-07-30 08:52:04 +02:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else
|
1993-07-30 08:52:04 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
op0 = orig_op0;
|
|
|
|
|
|
op1 = orig_op1;
|
1993-07-30 08:52:04 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
type0 = TREE_TYPE (op0);
|
|
|
|
|
|
type1 = TREE_TYPE (op1);
|
1993-09-08 11:56:15 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* The expression codes of the data types of the arguments tell us
|
|
|
|
|
|
whether the arguments are integers, floating, pointers, etc. */
|
|
|
|
|
|
code0 = TREE_CODE (type0);
|
|
|
|
|
|
code1 = TREE_CODE (type1);
|
|
|
|
|
|
|
|
|
|
|
|
/* Strip NON_LVALUE_EXPRs, etc., since we aren't using as an lvalue. */
|
|
|
|
|
|
STRIP_TYPE_NOPS (op0);
|
|
|
|
|
|
STRIP_TYPE_NOPS (op1);
|
|
|
|
|
|
|
|
|
|
|
|
/* If an error was already reported for one of the arguments,
|
|
|
|
|
|
avoid reporting another error. */
|
|
|
|
|
|
|
|
|
|
|
|
if (code0 == ERROR_MARK || code1 == ERROR_MARK)
|
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
|
|
|
|
|
|
switch (code)
|
1993-07-23 20:49:55 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
case PLUS_EXPR:
|
|
|
|
|
|
/* Handle the pointer + int case. */
|
|
|
|
|
|
if (code0 == POINTER_TYPE && code1 == INTEGER_TYPE)
|
|
|
|
|
|
return pointer_int_sum (PLUS_EXPR, op0, op1);
|
|
|
|
|
|
else if (code1 == POINTER_TYPE && code0 == INTEGER_TYPE)
|
|
|
|
|
|
return pointer_int_sum (PLUS_EXPR, op1, op0);
|
1993-04-10 02:02:10 +02:00
|
|
|
|
else
|
2003-07-18 02:26:51 +02:00
|
|
|
|
common = 1;
|
|
|
|
|
|
break;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
case MINUS_EXPR:
|
|
|
|
|
|
/* Subtraction of two similar pointers.
|
|
|
|
|
|
We must subtract them as integers, then divide by object size. */
|
|
|
|
|
|
if (code0 == POINTER_TYPE && code1 == POINTER_TYPE
|
|
|
|
|
|
&& comp_target_types (type0, type1, 1))
|
|
|
|
|
|
return pointer_diff (op0, op1);
|
|
|
|
|
|
/* Handle pointer minus int. Just like pointer plus int. */
|
|
|
|
|
|
else if (code0 == POINTER_TYPE && code1 == INTEGER_TYPE)
|
|
|
|
|
|
return pointer_int_sum (MINUS_EXPR, op0, op1);
|
|
|
|
|
|
else
|
|
|
|
|
|
common = 1;
|
|
|
|
|
|
break;
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
case MULT_EXPR:
|
|
|
|
|
|
common = 1;
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case TRUNC_DIV_EXPR:
|
|
|
|
|
|
case CEIL_DIV_EXPR:
|
|
|
|
|
|
case FLOOR_DIV_EXPR:
|
|
|
|
|
|
case ROUND_DIV_EXPR:
|
|
|
|
|
|
case EXACT_DIV_EXPR:
|
|
|
|
|
|
/* Floating point division by zero is a legitimate way to obtain
|
|
|
|
|
|
infinities and NaNs. */
|
|
|
|
|
|
if (warn_div_by_zero && skip_evaluation == 0 && integer_zerop (op1))
|
|
|
|
|
|
warning ("division by zero");
|
|
|
|
|
|
|
|
|
|
|
|
if ((code0 == INTEGER_TYPE || code0 == REAL_TYPE
|
|
|
|
|
|
|| code0 == COMPLEX_TYPE || code0 == VECTOR_TYPE)
|
|
|
|
|
|
&& (code1 == INTEGER_TYPE || code1 == REAL_TYPE
|
|
|
|
|
|
|| code1 == COMPLEX_TYPE || code1 == VECTOR_TYPE))
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2004-07-21 10:57:07 +02:00
|
|
|
|
if (code0 == COMPLEX_TYPE || code0 == VECTOR_TYPE)
|
|
|
|
|
|
code0 = TREE_CODE (TREE_TYPE (TREE_TYPE (op0)));
|
|
|
|
|
|
if (code1 == COMPLEX_TYPE || code1 == VECTOR_TYPE)
|
|
|
|
|
|
code1 = TREE_CODE (TREE_TYPE (TREE_TYPE (op1)));
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (!(code0 == INTEGER_TYPE && code1 == INTEGER_TYPE))
|
|
|
|
|
|
resultcode = RDIV_EXPR;
|
|
|
|
|
|
else
|
|
|
|
|
|
/* Although it would be tempting to shorten always here, that
|
|
|
|
|
|
loses on some targets, since the modulo instruction is
|
|
|
|
|
|
undefined if the quotient can't be represented in the
|
|
|
|
|
|
computation mode. We shorten only if unsigned or if
|
|
|
|
|
|
dividing by something we know != -1. */
|
builtins.c, [...]: Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* builtins.c, c-aux-info.c, c-common.c, c-cppbuiltin.c, c-decl.c:
Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* c-format.c, c-opts.c, c-pretty-print.c, c-typeck.c: Likewise.
* calls.c, convert.c, dbxout.c, dojump.c, dwarf2out.c: Likewise.
* expmed.c, expr.c, fold-const.c, function.c, integrate.c: Likewise.
* optabs.c, sdbout.c, stmt.c, stor-layout.c, tree-dump.c: Likewise.
* tree.c, config/iq2000/iq2000.c, config/m32r/m32r.c: Likewise.
* config/mips/mips.c, config/rs6000/rs6000.c: Likewise.
* config/s390/s390.c, config/sparc/sparc.c, objc/objc-act.c: Likewise.
* stor-layout.c (layout_type, case COMPLEX_TYPE): Test for
REAL_TYPE, not INTEGER_TYPE.
(layout_type, case VECTOR_TYPE): Simplify code.
* tree.c (build_vector_type_for_mode): Remove dup unsigned setting.
* tree.h: Update comments.
(STRIP_NOPS): Use TYPE_UNSIGNED.
(TYPE_UNSIGNED): New macro.
(TYPE_TRAP_SIGNED): Remove now redundant check.
(SAVE_EXPR_NOPLACEHOLDER): Don't use TREE_UNSIGNED.
* cp/call.c (joust): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* cp/class.c (check_bitfield_decl): Likewise.
* cp/cvt.c (type_promotes_to): Likewise.
* cp/decl.c (finish_enum): Likewise.
* cp/mangle.c (write_builtin_type): Likewise.
* cp/semantics.c (finish_switch_cond, finish_unary_op_expr): Likewise.
* cp/typeck.c (type_after_usual_arithmetic_conversions): Likewise.
(build_binary_op): Likewise.
* f/com.c (ffecom_arrayref_): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
(ffecom_expr_): Likewise.
* java/jcf-write.c (generate_bytecode_insns): Use TYPE_UNSIGNED.
* treelang/treetree.c (tree_lang_signed_or_unsigned_type):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/decl.c (gnat_to_gnu_entity, make_type_from_size):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/trans.c (tree_transform, convert_with_check): Likewise.
* ada/utils.c (gnat_signed_or_unsigned_type): Likewise.
(build_vms_descriptor, unchecked_convert): Likewise.
* ada/utils2.c (nonbinary_modular_operation): Likewise.
From-SVN: r80287
2004-04-01 05:50:43 +02:00
|
|
|
|
shorten = (TYPE_UNSIGNED (TREE_TYPE (orig_op0))
|
2003-07-18 02:26:51 +02:00
|
|
|
|
|| (TREE_CODE (op1) == INTEGER_CST
|
|
|
|
|
|
&& ! integer_all_onesp (op1)));
|
|
|
|
|
|
common = 1;
|
|
|
|
|
|
}
|
|
|
|
|
|
break;
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
case BIT_AND_EXPR:
|
|
|
|
|
|
case BIT_IOR_EXPR:
|
|
|
|
|
|
case BIT_XOR_EXPR:
|
|
|
|
|
|
if (code0 == INTEGER_TYPE && code1 == INTEGER_TYPE)
|
|
|
|
|
|
shorten = -1;
|
|
|
|
|
|
else if (code0 == VECTOR_TYPE && code1 == VECTOR_TYPE)
|
|
|
|
|
|
common = 1;
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case TRUNC_MOD_EXPR:
|
|
|
|
|
|
case FLOOR_MOD_EXPR:
|
|
|
|
|
|
if (warn_div_by_zero && skip_evaluation == 0 && integer_zerop (op1))
|
|
|
|
|
|
warning ("division by zero");
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (code0 == INTEGER_TYPE && code1 == INTEGER_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Although it would be tempting to shorten always here, that loses
|
|
|
|
|
|
on some targets, since the modulo instruction is undefined if the
|
|
|
|
|
|
quotient can't be represented in the computation mode. We shorten
|
|
|
|
|
|
only if unsigned or if dividing by something we know != -1. */
|
builtins.c, [...]: Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* builtins.c, c-aux-info.c, c-common.c, c-cppbuiltin.c, c-decl.c:
Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* c-format.c, c-opts.c, c-pretty-print.c, c-typeck.c: Likewise.
* calls.c, convert.c, dbxout.c, dojump.c, dwarf2out.c: Likewise.
* expmed.c, expr.c, fold-const.c, function.c, integrate.c: Likewise.
* optabs.c, sdbout.c, stmt.c, stor-layout.c, tree-dump.c: Likewise.
* tree.c, config/iq2000/iq2000.c, config/m32r/m32r.c: Likewise.
* config/mips/mips.c, config/rs6000/rs6000.c: Likewise.
* config/s390/s390.c, config/sparc/sparc.c, objc/objc-act.c: Likewise.
* stor-layout.c (layout_type, case COMPLEX_TYPE): Test for
REAL_TYPE, not INTEGER_TYPE.
(layout_type, case VECTOR_TYPE): Simplify code.
* tree.c (build_vector_type_for_mode): Remove dup unsigned setting.
* tree.h: Update comments.
(STRIP_NOPS): Use TYPE_UNSIGNED.
(TYPE_UNSIGNED): New macro.
(TYPE_TRAP_SIGNED): Remove now redundant check.
(SAVE_EXPR_NOPLACEHOLDER): Don't use TREE_UNSIGNED.
* cp/call.c (joust): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* cp/class.c (check_bitfield_decl): Likewise.
* cp/cvt.c (type_promotes_to): Likewise.
* cp/decl.c (finish_enum): Likewise.
* cp/mangle.c (write_builtin_type): Likewise.
* cp/semantics.c (finish_switch_cond, finish_unary_op_expr): Likewise.
* cp/typeck.c (type_after_usual_arithmetic_conversions): Likewise.
(build_binary_op): Likewise.
* f/com.c (ffecom_arrayref_): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
(ffecom_expr_): Likewise.
* java/jcf-write.c (generate_bytecode_insns): Use TYPE_UNSIGNED.
* treelang/treetree.c (tree_lang_signed_or_unsigned_type):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/decl.c (gnat_to_gnu_entity, make_type_from_size):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/trans.c (tree_transform, convert_with_check): Likewise.
* ada/utils.c (gnat_signed_or_unsigned_type): Likewise.
(build_vms_descriptor, unchecked_convert): Likewise.
* ada/utils2.c (nonbinary_modular_operation): Likewise.
From-SVN: r80287
2004-04-01 05:50:43 +02:00
|
|
|
|
shorten = (TYPE_UNSIGNED (TREE_TYPE (orig_op0))
|
2003-07-18 02:26:51 +02:00
|
|
|
|
|| (TREE_CODE (op1) == INTEGER_CST
|
|
|
|
|
|
&& ! integer_all_onesp (op1)));
|
|
|
|
|
|
common = 1;
|
|
|
|
|
|
}
|
|
|
|
|
|
break;
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
case TRUTH_ANDIF_EXPR:
|
|
|
|
|
|
case TRUTH_ORIF_EXPR:
|
|
|
|
|
|
case TRUTH_AND_EXPR:
|
|
|
|
|
|
case TRUTH_OR_EXPR:
|
|
|
|
|
|
case TRUTH_XOR_EXPR:
|
|
|
|
|
|
if ((code0 == INTEGER_TYPE || code0 == POINTER_TYPE
|
|
|
|
|
|
|| code0 == REAL_TYPE || code0 == COMPLEX_TYPE)
|
|
|
|
|
|
&& (code1 == INTEGER_TYPE || code1 == POINTER_TYPE
|
|
|
|
|
|
|| code1 == REAL_TYPE || code1 == COMPLEX_TYPE))
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Result of these operations is always an int,
|
|
|
|
|
|
but that does not mean the operands should be
|
|
|
|
|
|
converted to ints! */
|
|
|
|
|
|
result_type = integer_type_node;
|
alias.c (get_alias_set): Replace calls via (*lang_hooks.foo) () with lang_hooks.foo ().
* alias.c (get_alias_set): Replace calls via (*lang_hooks.foo) ()
with lang_hooks.foo ().
* builtins.c (expand_builtin_va_arg): Likewise.
* c-common.c (fname_as_string, c_common_truthvalue_conversion,
c_common_type_for_mode, c_common_nodes_and_builtins,
handle_mode_attribute, handle_vector_size_attribute): Likewise.
* c-convert.c (convert): Likewise.
* c-format.c (check_format_types): Likewise.
* c-objc-common.c (c_tree_printer): Likewise.
* c-typeck.c (build_unary_op, build_conditional_expr,
build_binary_op): Likewise.
* calls.c (try_to_integrate, expand_call,
emit_library_call_value_1): Likewise.
* cgraph.c (cgraph_node_name, cgraph_function_possibly_inlined_p):
Likewise.
* cgraphunit.c (record_call_1, cgraph_analyze_function,
cgraph_expand_function): Likewise.
* convert.c (convert_to_pointer, convert_to_integer): Likewise.
* coverage.c (build_fn_info_type, build_ctr_info_type,
build_gcov_info, create_coverage): Likewise.
* dbxout.c (dbxout_init): Likewise.
* diagnostic.c (diagnostic_report_current_function): Likewise.
* dojump.c (do_jump): Likewise.
* dwarf2out.c (dwarf2_name): Likewise.
* except.c (init_eh): Likewise.
* explow.c (expr_size, int_expr_size): Likewise.
* expmed.c (make_tree, const_mult_add_overflow_p, expand_mult_add):
Likewise.
* expr.c (store_expr, store_constructor, safe_from_p,
expand_expr_real, do_store_flag, try_casesi): Likewise.
* function.c (push_function_context_to, pop_function_context_from,
free_after_parsing, assign_stack_local_1, assign_stack_temp_for_type,
put_var_into_stack, allocate_struct_function, current_function_name):
Likewise.
* integrate.c (copy_decl_for_inlining, expand_inline_function):
Likewise.
* langhooks.c (lhd_clear_binding_stack, write_global_declarations,
lhd_print_error_function): Likewise.
* opts.c (handle_option, decode_options): Likewise.
* passes.c (open_dump_file): Likewise.
* print-tree.c (print_node): Likewise.
* stmt.c (expand_fixup, fixup_gotos, expand_asm_operands,
expand_decl_cleanup, emit_case_nodes): Likewise.
* stor-layout.c (variable_size): Likewise.
* toplev.c (announce_function, wrapup_global_declarations,
check_global_declarations, compile_file, default_tree_printer,
process_options, lang_dependent_init, finalize): Likewise.
* tree-dump.c (dequeue_and_dump): Likewise.
* tree-inline.c (remap_decl, remap_block, copy_body_r,
initialize_inlined_parameters, declare_return_variable,
inlinable_function_p, expand_call_inline, optimize_inline_calls,
walk_tree, copy_tree_r): Likewise.
* tree-optimize.c (tree_rest_of_compilation): Likewise.
* tree.c (decl_assembler_name, tree_size, size_in_bytes, staticp,
unsafe_for_reeval, get_unwidened, get_narrower, get_callee_fndecl,
variably_modified_type_p, dump_tree_statistics): Likewise.
* varasm.c (assemble_variable, compare_constant, copy_constant,
force_const_mem, compute_reloc_for_constant, output_constant,
output_addressed_constants, initializer_constant_valid_p): Likewise.
From-SVN: r79481
2004-03-14 23:26:14 +01:00
|
|
|
|
op0 = lang_hooks.truthvalue_conversion (op0);
|
|
|
|
|
|
op1 = lang_hooks.truthvalue_conversion (op1);
|
2003-07-18 02:26:51 +02:00
|
|
|
|
converted = 1;
|
|
|
|
|
|
}
|
|
|
|
|
|
break;
|
2002-03-22 03:03:46 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Shift operations: result has same type as first operand;
|
|
|
|
|
|
always convert second operand to int.
|
|
|
|
|
|
Also set SHORT_SHIFT if shifting rightward. */
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
case RSHIFT_EXPR:
|
|
|
|
|
|
if (code0 == INTEGER_TYPE && code1 == INTEGER_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (TREE_CODE (op1) == INTEGER_CST && skip_evaluation == 0)
|
1993-07-27 07:57:26 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (tree_int_cst_sgn (op1) < 0)
|
|
|
|
|
|
warning ("right shift count is negative");
|
|
|
|
|
|
else
|
2003-01-09 10:18:52 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (! integer_zerop (op1))
|
|
|
|
|
|
short_shift = 1;
|
|
|
|
|
|
|
|
|
|
|
|
if (compare_tree_int (op1, TYPE_PRECISION (type0)) >= 0)
|
|
|
|
|
|
warning ("right shift count >= width of type");
|
2003-01-09 10:18:52 +01:00
|
|
|
|
}
|
1993-07-27 07:57:26 +02:00
|
|
|
|
}
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Use the type of the value to be shifted. */
|
|
|
|
|
|
result_type = type0;
|
|
|
|
|
|
/* Convert the shift-count to an integer, regardless of size
|
|
|
|
|
|
of value being shifted. */
|
|
|
|
|
|
if (TYPE_MAIN_VARIANT (TREE_TYPE (op1)) != integer_type_node)
|
|
|
|
|
|
op1 = convert (integer_type_node, op1);
|
|
|
|
|
|
/* Avoid converting op1 to result_type later. */
|
|
|
|
|
|
converted = 1;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
break;
|
2000-08-09 21:52:35 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
case LSHIFT_EXPR:
|
|
|
|
|
|
if (code0 == INTEGER_TYPE && code1 == INTEGER_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (TREE_CODE (op1) == INTEGER_CST && skip_evaluation == 0)
|
1993-07-23 20:49:55 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (tree_int_cst_sgn (op1) < 0)
|
|
|
|
|
|
warning ("left shift count is negative");
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else if (compare_tree_int (op1, TYPE_PRECISION (type0)) >= 0)
|
|
|
|
|
|
warning ("left shift count >= width of type");
|
1993-09-13 22:19:42 +02:00
|
|
|
|
}
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Use the type of the value to be shifted. */
|
|
|
|
|
|
result_type = type0;
|
|
|
|
|
|
/* Convert the shift-count to an integer, regardless of size
|
|
|
|
|
|
of value being shifted. */
|
|
|
|
|
|
if (TYPE_MAIN_VARIANT (TREE_TYPE (op1)) != integer_type_node)
|
|
|
|
|
|
op1 = convert (integer_type_node, op1);
|
|
|
|
|
|
/* Avoid converting op1 to result_type later. */
|
|
|
|
|
|
converted = 1;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
break;
|
1993-07-23 20:49:55 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
case RROTATE_EXPR:
|
|
|
|
|
|
case LROTATE_EXPR:
|
|
|
|
|
|
if (code0 == INTEGER_TYPE && code1 == INTEGER_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (TREE_CODE (op1) == INTEGER_CST && skip_evaluation == 0)
|
1993-07-23 20:49:55 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (tree_int_cst_sgn (op1) < 0)
|
|
|
|
|
|
warning ("shift count is negative");
|
|
|
|
|
|
else if (compare_tree_int (op1, TYPE_PRECISION (type0)) >= 0)
|
|
|
|
|
|
warning ("shift count >= width of type");
|
1993-07-23 20:49:55 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Use the type of the value to be shifted. */
|
|
|
|
|
|
result_type = type0;
|
|
|
|
|
|
/* Convert the shift-count to an integer, regardless of size
|
|
|
|
|
|
of value being shifted. */
|
|
|
|
|
|
if (TYPE_MAIN_VARIANT (TREE_TYPE (op1)) != integer_type_node)
|
|
|
|
|
|
op1 = convert (integer_type_node, op1);
|
|
|
|
|
|
/* Avoid converting op1 to result_type later. */
|
|
|
|
|
|
converted = 1;
|
|
|
|
|
|
}
|
|
|
|
|
|
break;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
case EQ_EXPR:
|
|
|
|
|
|
case NE_EXPR:
|
|
|
|
|
|
if (warn_float_equal && (code0 == REAL_TYPE || code1 == REAL_TYPE))
|
|
|
|
|
|
warning ("comparing floating point with == or != is unsafe");
|
|
|
|
|
|
/* Result of comparison is always int,
|
|
|
|
|
|
but don't convert the args to int! */
|
|
|
|
|
|
build_type = integer_type_node;
|
|
|
|
|
|
if ((code0 == INTEGER_TYPE || code0 == REAL_TYPE
|
2004-03-26 12:45:19 +01:00
|
|
|
|
|| code0 == COMPLEX_TYPE)
|
2003-07-18 02:26:51 +02:00
|
|
|
|
&& (code1 == INTEGER_TYPE || code1 == REAL_TYPE
|
2004-03-26 12:45:19 +01:00
|
|
|
|
|| code1 == COMPLEX_TYPE))
|
2003-07-18 02:26:51 +02:00
|
|
|
|
short_compare = 1;
|
|
|
|
|
|
else if (code0 == POINTER_TYPE && code1 == POINTER_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
tree tt0 = TREE_TYPE (type0);
|
|
|
|
|
|
tree tt1 = TREE_TYPE (type1);
|
|
|
|
|
|
/* Anything compares with void *. void * compares with anything.
|
|
|
|
|
|
Otherwise, the targets must be compatible
|
|
|
|
|
|
and both must be object or both incomplete. */
|
|
|
|
|
|
if (comp_target_types (type0, type1, 1))
|
2004-06-06 17:21:59 +02:00
|
|
|
|
result_type = common_pointer_type (type0, type1);
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else if (VOID_TYPE_P (tt0))
|
1997-03-02 19:25:40 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* op0 != orig_op0 detects the case of something
|
|
|
|
|
|
whose value is 0 but which isn't a valid null ptr const. */
|
|
|
|
|
|
if (pedantic && (!integer_zerop (op0) || op0 != orig_op0)
|
|
|
|
|
|
&& TREE_CODE (tt1) == FUNCTION_TYPE)
|
|
|
|
|
|
pedwarn ("ISO C forbids comparison of `void *' with function pointer");
|
1997-03-02 19:25:40 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else if (VOID_TYPE_P (tt1))
|
2002-02-12 23:26:12 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (pedantic && (!integer_zerop (op1) || op1 != orig_op1)
|
|
|
|
|
|
&& TREE_CODE (tt0) == FUNCTION_TYPE)
|
|
|
|
|
|
pedwarn ("ISO C forbids comparison of `void *' with function pointer");
|
2002-02-12 23:26:12 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else
|
|
|
|
|
|
pedwarn ("comparison of distinct pointer types lacks a cast");
|
2002-02-12 23:26:12 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (result_type == NULL_TREE)
|
|
|
|
|
|
result_type = ptr_type_node;
|
2002-02-12 23:26:12 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else if (code0 == POINTER_TYPE && TREE_CODE (op1) == INTEGER_CST
|
|
|
|
|
|
&& integer_zerop (op1))
|
|
|
|
|
|
result_type = type0;
|
|
|
|
|
|
else if (code1 == POINTER_TYPE && TREE_CODE (op0) == INTEGER_CST
|
|
|
|
|
|
&& integer_zerop (op0))
|
|
|
|
|
|
result_type = type1;
|
|
|
|
|
|
else if (code0 == POINTER_TYPE && code1 == INTEGER_TYPE)
|
1993-07-23 20:49:55 +02:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
result_type = type0;
|
|
|
|
|
|
pedwarn ("comparison between pointer and integer");
|
1993-07-23 20:49:55 +02:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else if (code0 == INTEGER_TYPE && code1 == POINTER_TYPE)
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
result_type = type1;
|
|
|
|
|
|
pedwarn ("comparison between pointer and integer");
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
break;
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
case MAX_EXPR:
|
|
|
|
|
|
case MIN_EXPR:
|
|
|
|
|
|
if ((code0 == INTEGER_TYPE || code0 == REAL_TYPE)
|
|
|
|
|
|
&& (code1 == INTEGER_TYPE || code1 == REAL_TYPE))
|
|
|
|
|
|
shorten = 1;
|
|
|
|
|
|
else if (code0 == POINTER_TYPE && code1 == POINTER_TYPE)
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (comp_target_types (type0, type1, 1))
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
{
|
2004-06-06 17:21:59 +02:00
|
|
|
|
result_type = common_pointer_type (type0, type1);
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (pedantic
|
|
|
|
|
|
&& TREE_CODE (TREE_TYPE (type0)) == FUNCTION_TYPE)
|
|
|
|
|
|
pedwarn ("ISO C forbids ordered comparisons of pointers to functions");
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
else
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
result_type = ptr_type_node;
|
|
|
|
|
|
pedwarn ("comparison of distinct pointer types lacks a cast");
|
c-typeck.c (store_init_value): Don't require constant initializer elements with -pedantic -std=c99.
* c-typeck.c (store_init_value): Don't require constant initializer
elements with -pedantic -std=c99.
(digest_init): Change error about non-constant initializer elements
into pedwarn.
(constructor_range_end): Remove.
(constructor_incremental, designator_depth,
designator_errorneous): New variables.
(struct constructor_stack): Remove range_end, add incremental.
(struct constructor_range_stack, constructor_range_stack): New.
(struct initializer_stack): Add constructor_range_stack.
(finish_init): Set it.
(start_init): Likewise. require_constant_elements for non-static
trees only if not flag_isoc99.
(really_start_incremental_init): Remove constructor_range_end, add
constructor_incremental.
(pop_init_level): Likewise.
(push_init_level): Likewise. If implicit and the subobject had some
value set already, preinitialize the level with it.
Warn about missing braces only if not pushing due to designators.
(set_designator, push_range_stack): New functions.
(set_init_label): Use them.
(set_init_index): Likewise. Remove constructor_range_end.
Error if designator index is outside of array bounds.
(add_pending_init): Compare values of purpose index trees, not the
trees themselves. Allow overwriting of already initialized element.
Issue a warning if it had side-effects.
(set_nonincremental_init, set_nonincremental_init_from_string): New
functions.
(pending_init_member): Rename to...
(find_init_member): ...this function. Call set_nonincremental_init
if necessary. Compare values of purpose index trees, not the trees
themselves. Return the actual value, not just non-zero if something
is found.
(output_init_element): Remove checks for duplicates.
If field has zero size, only check the initializer for correctness.
Call set_nonincremental_init if necessary. Push RECORD/ARRAY into AVL
if constructor_incremental is zero. Change error about initializers
not computable at load time into pedwarn.
(output_pending_init_elements): Compare bit positions, not
FIELD_DECLs to take into account zero-sized fields.
(process_init_element): Use constructor_range_stack to fill all
ranges in the designator lists from current level up.
* extend.texi: Update documentation for labeled elements.
* gcc.c-torture/execute/20000801-3.x: Remove.
* gcc.dg/c90-init-1.c: New test.
* gcc.dg/c99-init-1.c: New test.
* gcc.dg/c99-init-2.c: New test.
* gcc.dg/gnu99-init-1.c: New test.
From-SVN: r38968
2001-01-13 00:18:05 +01:00
|
|
|
|
}
|
|
|
|
|
|
}
|
1993-07-23 20:49:55 +02:00
|
|
|
|
break;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
case LE_EXPR:
|
|
|
|
|
|
case GE_EXPR:
|
|
|
|
|
|
case LT_EXPR:
|
|
|
|
|
|
case GT_EXPR:
|
|
|
|
|
|
build_type = integer_type_node;
|
|
|
|
|
|
if ((code0 == INTEGER_TYPE || code0 == REAL_TYPE)
|
|
|
|
|
|
&& (code1 == INTEGER_TYPE || code1 == REAL_TYPE))
|
|
|
|
|
|
short_compare = 1;
|
|
|
|
|
|
else if (code0 == POINTER_TYPE && code1 == POINTER_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (comp_target_types (type0, type1, 1))
|
|
|
|
|
|
{
|
2004-06-06 17:21:59 +02:00
|
|
|
|
result_type = common_pointer_type (type0, type1);
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (!COMPLETE_TYPE_P (TREE_TYPE (type0))
|
|
|
|
|
|
!= !COMPLETE_TYPE_P (TREE_TYPE (type1)))
|
|
|
|
|
|
pedwarn ("comparison of complete and incomplete pointers");
|
|
|
|
|
|
else if (pedantic
|
|
|
|
|
|
&& TREE_CODE (TREE_TYPE (type0)) == FUNCTION_TYPE)
|
|
|
|
|
|
pedwarn ("ISO C forbids ordered comparisons of pointers to functions");
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
result_type = ptr_type_node;
|
|
|
|
|
|
pedwarn ("comparison of distinct pointer types lacks a cast");
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (code0 == POINTER_TYPE && TREE_CODE (op1) == INTEGER_CST
|
|
|
|
|
|
&& integer_zerop (op1))
|
|
|
|
|
|
{
|
|
|
|
|
|
result_type = type0;
|
|
|
|
|
|
if (pedantic || extra_warnings)
|
|
|
|
|
|
pedwarn ("ordered comparison of pointer with integer zero");
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (code1 == POINTER_TYPE && TREE_CODE (op0) == INTEGER_CST
|
|
|
|
|
|
&& integer_zerop (op0))
|
|
|
|
|
|
{
|
|
|
|
|
|
result_type = type1;
|
|
|
|
|
|
if (pedantic)
|
|
|
|
|
|
pedwarn ("ordered comparison of pointer with integer zero");
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (code0 == POINTER_TYPE && code1 == INTEGER_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
result_type = type0;
|
|
|
|
|
|
pedwarn ("comparison between pointer and integer");
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (code0 == INTEGER_TYPE && code1 == POINTER_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
result_type = type1;
|
|
|
|
|
|
pedwarn ("comparison between pointer and integer");
|
|
|
|
|
|
}
|
|
|
|
|
|
break;
|
2000-12-20 19:18:24 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
case UNORDERED_EXPR:
|
|
|
|
|
|
case ORDERED_EXPR:
|
|
|
|
|
|
case UNLT_EXPR:
|
|
|
|
|
|
case UNLE_EXPR:
|
|
|
|
|
|
case UNGT_EXPR:
|
|
|
|
|
|
case UNGE_EXPR:
|
|
|
|
|
|
case UNEQ_EXPR:
|
re PR rtl-optimization/15649 (ICE with __builtin_isgreater and -ffast-math)
gcc/ChangeLog:
2004-05-27 Paolo Bonzini <bonzini@gnu.org>
Roger Sayle <roger@eyesopen.com>
PR rtl-optimization/15649
Add LTGT_EXPR and improve pretty-printing of unordered
comparisons.
* c-common.c (c_common_truthvalue_conversion):
Handle LTGT_EXPR.
* c-typeck.c (build_binary_op): Likewise.
* dojump.c (do_jump): Likewise.
* expr.c (expand_expr_real_1, do_store_flag): Likewise.
* predict.c (tree_predict_by_opcode): Likewise.
* real.c (real_compare): Likewise.
* tree-cfg.c (verify_expr): Likewise.
* tree-inline.c (estimate_num_insns_1): Likewise.
* tree-pretty-print.c (dump_generic_node): Likewise.
Handle ORDERED_EXPR, UNORDERED_EXPR.
(op_symbol): Print unordered comparisons differently
than ordered ones.
* tree.def (LTGT_EXPR): New '<' tree code.
* doc/c-tree.texi (Expressions): Document floating-point
comparison nodes.
Fold comparisons between floating point values.
* fold-const.c (enum comparison_code): New, from
#define'd constants. Define compcodes for unordered
comparisons and for invalid transformations.
(invert_tree_comparison): Add "honor_nans" parameter.
(fold_truthop): Revamp to work on floating-point types too.
(comparison_to_compcode): Support unordered comparisons.
Use new enum comparison_code.
(compcode_to_comparison): Likewise.
(combine_compcodes): New function.
(invert_truthvalue): Let invert_tree_comparison decide
whether it is valid to fold the comparison. Fold ORDERED
and UNORDERED even if flag_unsafe_math_optimizations is off,
and the remaining even if flag_unsafe_math_optimizations
is off but we are under -fno-trapping-math.
(fold_relational_const): Integer modes do not honor NaNs.
gcc/testsuite/ChangeLog:
2004-05-27 Paolo Bonzini <bonzini@gnu.org>
* gcc.c-torture/compare-fp-1.c, gcc.c-torture/compare-fp-2.c,
gcc.c-torture/compare-fp-3.c, gcc.c-torture/compare-fp-4.c,
gcc.c-torture/compare-fp-3.x, gcc.c-torture/compare-fp-4.x,
gcc.c-torture/pr15649-1.c: New.
Co-Authored-By: Roger Sayle <roger@eyesopen.com>
From-SVN: r82365
2004-05-28 18:37:08 +02:00
|
|
|
|
case LTGT_EXPR:
|
2003-07-18 02:26:51 +02:00
|
|
|
|
build_type = integer_type_node;
|
|
|
|
|
|
if (code0 != REAL_TYPE || code1 != REAL_TYPE)
|
|
|
|
|
|
{
|
|
|
|
|
|
error ("unordered comparison on non-floating point argument");
|
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
}
|
|
|
|
|
|
common = 1;
|
|
|
|
|
|
break;
|
2000-12-20 19:18:24 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
default:
|
|
|
|
|
|
break;
|
2002-11-04 01:22:57 +01:00
|
|
|
|
}
|
2000-09-17 09:38:23 +02:00
|
|
|
|
|
2004-02-03 12:22:41 +01:00
|
|
|
|
if (code0 == ERROR_MARK || code1 == ERROR_MARK)
|
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if ((code0 == INTEGER_TYPE || code0 == REAL_TYPE || code0 == COMPLEX_TYPE
|
|
|
|
|
|
|| code0 == VECTOR_TYPE)
|
|
|
|
|
|
&&
|
|
|
|
|
|
(code1 == INTEGER_TYPE || code1 == REAL_TYPE || code1 == COMPLEX_TYPE
|
|
|
|
|
|
|| code1 == VECTOR_TYPE))
|
1992-02-28 19:53:39 +01:00
|
|
|
|
{
|
2003-07-18 02:26:51 +02:00
|
|
|
|
int none_complex = (code0 != COMPLEX_TYPE && code1 != COMPLEX_TYPE);
|
2000-09-19 16:26:38 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (shorten || common || short_compare)
|
|
|
|
|
|
result_type = common_type (type0, type1);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* For certain operations (which identify themselves by shorten != 0)
|
|
|
|
|
|
if both args were extended from the same smaller type,
|
|
|
|
|
|
do the arithmetic in that type and then extend.
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
shorten !=0 and !=1 indicates a bitwise operation.
|
|
|
|
|
|
For them, this optimization is safe only if
|
|
|
|
|
|
both args are zero-extended or both are sign-extended.
|
|
|
|
|
|
Otherwise, we might change the result.
|
|
|
|
|
|
Eg, (short)-1 | (unsigned short)-1 is (int)-1
|
|
|
|
|
|
but calculated in (unsigned short) it would be (unsigned short)-1. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (shorten && none_complex)
|
|
|
|
|
|
{
|
|
|
|
|
|
int unsigned0, unsigned1;
|
|
|
|
|
|
tree arg0 = get_narrower (op0, &unsigned0);
|
|
|
|
|
|
tree arg1 = get_narrower (op1, &unsigned1);
|
|
|
|
|
|
/* UNS is 1 if the operation to be done is an unsigned one. */
|
builtins.c, [...]: Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* builtins.c, c-aux-info.c, c-common.c, c-cppbuiltin.c, c-decl.c:
Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* c-format.c, c-opts.c, c-pretty-print.c, c-typeck.c: Likewise.
* calls.c, convert.c, dbxout.c, dojump.c, dwarf2out.c: Likewise.
* expmed.c, expr.c, fold-const.c, function.c, integrate.c: Likewise.
* optabs.c, sdbout.c, stmt.c, stor-layout.c, tree-dump.c: Likewise.
* tree.c, config/iq2000/iq2000.c, config/m32r/m32r.c: Likewise.
* config/mips/mips.c, config/rs6000/rs6000.c: Likewise.
* config/s390/s390.c, config/sparc/sparc.c, objc/objc-act.c: Likewise.
* stor-layout.c (layout_type, case COMPLEX_TYPE): Test for
REAL_TYPE, not INTEGER_TYPE.
(layout_type, case VECTOR_TYPE): Simplify code.
* tree.c (build_vector_type_for_mode): Remove dup unsigned setting.
* tree.h: Update comments.
(STRIP_NOPS): Use TYPE_UNSIGNED.
(TYPE_UNSIGNED): New macro.
(TYPE_TRAP_SIGNED): Remove now redundant check.
(SAVE_EXPR_NOPLACEHOLDER): Don't use TREE_UNSIGNED.
* cp/call.c (joust): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* cp/class.c (check_bitfield_decl): Likewise.
* cp/cvt.c (type_promotes_to): Likewise.
* cp/decl.c (finish_enum): Likewise.
* cp/mangle.c (write_builtin_type): Likewise.
* cp/semantics.c (finish_switch_cond, finish_unary_op_expr): Likewise.
* cp/typeck.c (type_after_usual_arithmetic_conversions): Likewise.
(build_binary_op): Likewise.
* f/com.c (ffecom_arrayref_): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
(ffecom_expr_): Likewise.
* java/jcf-write.c (generate_bytecode_insns): Use TYPE_UNSIGNED.
* treelang/treetree.c (tree_lang_signed_or_unsigned_type):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/decl.c (gnat_to_gnu_entity, make_type_from_size):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/trans.c (tree_transform, convert_with_check): Likewise.
* ada/utils.c (gnat_signed_or_unsigned_type): Likewise.
(build_vms_descriptor, unchecked_convert): Likewise.
* ada/utils2.c (nonbinary_modular_operation): Likewise.
From-SVN: r80287
2004-04-01 05:50:43 +02:00
|
|
|
|
int uns = TYPE_UNSIGNED (result_type);
|
2003-07-18 02:26:51 +02:00
|
|
|
|
tree type;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
final_type = result_type;
|
1993-12-03 13:06:46 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Handle the case that OP0 (or OP1) does not *contain* a conversion
|
|
|
|
|
|
but it *requires* conversion to FINAL_TYPE. */
|
1993-12-03 13:06:46 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if ((TYPE_PRECISION (TREE_TYPE (op0))
|
|
|
|
|
|
== TYPE_PRECISION (TREE_TYPE (arg0)))
|
|
|
|
|
|
&& TREE_TYPE (op0) != final_type)
|
builtins.c, [...]: Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* builtins.c, c-aux-info.c, c-common.c, c-cppbuiltin.c, c-decl.c:
Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* c-format.c, c-opts.c, c-pretty-print.c, c-typeck.c: Likewise.
* calls.c, convert.c, dbxout.c, dojump.c, dwarf2out.c: Likewise.
* expmed.c, expr.c, fold-const.c, function.c, integrate.c: Likewise.
* optabs.c, sdbout.c, stmt.c, stor-layout.c, tree-dump.c: Likewise.
* tree.c, config/iq2000/iq2000.c, config/m32r/m32r.c: Likewise.
* config/mips/mips.c, config/rs6000/rs6000.c: Likewise.
* config/s390/s390.c, config/sparc/sparc.c, objc/objc-act.c: Likewise.
* stor-layout.c (layout_type, case COMPLEX_TYPE): Test for
REAL_TYPE, not INTEGER_TYPE.
(layout_type, case VECTOR_TYPE): Simplify code.
* tree.c (build_vector_type_for_mode): Remove dup unsigned setting.
* tree.h: Update comments.
(STRIP_NOPS): Use TYPE_UNSIGNED.
(TYPE_UNSIGNED): New macro.
(TYPE_TRAP_SIGNED): Remove now redundant check.
(SAVE_EXPR_NOPLACEHOLDER): Don't use TREE_UNSIGNED.
* cp/call.c (joust): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* cp/class.c (check_bitfield_decl): Likewise.
* cp/cvt.c (type_promotes_to): Likewise.
* cp/decl.c (finish_enum): Likewise.
* cp/mangle.c (write_builtin_type): Likewise.
* cp/semantics.c (finish_switch_cond, finish_unary_op_expr): Likewise.
* cp/typeck.c (type_after_usual_arithmetic_conversions): Likewise.
(build_binary_op): Likewise.
* f/com.c (ffecom_arrayref_): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
(ffecom_expr_): Likewise.
* java/jcf-write.c (generate_bytecode_insns): Use TYPE_UNSIGNED.
* treelang/treetree.c (tree_lang_signed_or_unsigned_type):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/decl.c (gnat_to_gnu_entity, make_type_from_size):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/trans.c (tree_transform, convert_with_check): Likewise.
* ada/utils.c (gnat_signed_or_unsigned_type): Likewise.
(build_vms_descriptor, unchecked_convert): Likewise.
* ada/utils2.c (nonbinary_modular_operation): Likewise.
From-SVN: r80287
2004-04-01 05:50:43 +02:00
|
|
|
|
unsigned0 = TYPE_UNSIGNED (TREE_TYPE (op0));
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if ((TYPE_PRECISION (TREE_TYPE (op1))
|
|
|
|
|
|
== TYPE_PRECISION (TREE_TYPE (arg1)))
|
|
|
|
|
|
&& TREE_TYPE (op1) != final_type)
|
builtins.c, [...]: Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* builtins.c, c-aux-info.c, c-common.c, c-cppbuiltin.c, c-decl.c:
Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* c-format.c, c-opts.c, c-pretty-print.c, c-typeck.c: Likewise.
* calls.c, convert.c, dbxout.c, dojump.c, dwarf2out.c: Likewise.
* expmed.c, expr.c, fold-const.c, function.c, integrate.c: Likewise.
* optabs.c, sdbout.c, stmt.c, stor-layout.c, tree-dump.c: Likewise.
* tree.c, config/iq2000/iq2000.c, config/m32r/m32r.c: Likewise.
* config/mips/mips.c, config/rs6000/rs6000.c: Likewise.
* config/s390/s390.c, config/sparc/sparc.c, objc/objc-act.c: Likewise.
* stor-layout.c (layout_type, case COMPLEX_TYPE): Test for
REAL_TYPE, not INTEGER_TYPE.
(layout_type, case VECTOR_TYPE): Simplify code.
* tree.c (build_vector_type_for_mode): Remove dup unsigned setting.
* tree.h: Update comments.
(STRIP_NOPS): Use TYPE_UNSIGNED.
(TYPE_UNSIGNED): New macro.
(TYPE_TRAP_SIGNED): Remove now redundant check.
(SAVE_EXPR_NOPLACEHOLDER): Don't use TREE_UNSIGNED.
* cp/call.c (joust): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* cp/class.c (check_bitfield_decl): Likewise.
* cp/cvt.c (type_promotes_to): Likewise.
* cp/decl.c (finish_enum): Likewise.
* cp/mangle.c (write_builtin_type): Likewise.
* cp/semantics.c (finish_switch_cond, finish_unary_op_expr): Likewise.
* cp/typeck.c (type_after_usual_arithmetic_conversions): Likewise.
(build_binary_op): Likewise.
* f/com.c (ffecom_arrayref_): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
(ffecom_expr_): Likewise.
* java/jcf-write.c (generate_bytecode_insns): Use TYPE_UNSIGNED.
* treelang/treetree.c (tree_lang_signed_or_unsigned_type):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/decl.c (gnat_to_gnu_entity, make_type_from_size):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/trans.c (tree_transform, convert_with_check): Likewise.
* ada/utils.c (gnat_signed_or_unsigned_type): Likewise.
(build_vms_descriptor, unchecked_convert): Likewise.
* ada/utils2.c (nonbinary_modular_operation): Likewise.
From-SVN: r80287
2004-04-01 05:50:43 +02:00
|
|
|
|
unsigned1 = TYPE_UNSIGNED (TREE_TYPE (op1));
|
1994-01-22 23:18:10 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Now UNSIGNED0 is 1 if ARG0 zero-extends to FINAL_TYPE. */
|
1995-01-28 21:14:09 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* For bitwise operations, signedness of nominal type
|
|
|
|
|
|
does not matter. Consider only how operands were extended. */
|
|
|
|
|
|
if (shorten == -1)
|
|
|
|
|
|
uns = unsigned0;
|
1995-01-28 21:14:09 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Note that in all three cases below we refrain from optimizing
|
|
|
|
|
|
an unsigned operation on sign-extended args.
|
|
|
|
|
|
That would not be valid. */
|
1995-01-28 21:14:09 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Both args variable: if both extended in same way
|
|
|
|
|
|
from same width, do it in that width.
|
|
|
|
|
|
Do it unsigned if args were zero-extended. */
|
|
|
|
|
|
if ((TYPE_PRECISION (TREE_TYPE (arg0))
|
|
|
|
|
|
< TYPE_PRECISION (result_type))
|
|
|
|
|
|
&& (TYPE_PRECISION (TREE_TYPE (arg1))
|
|
|
|
|
|
== TYPE_PRECISION (TREE_TYPE (arg0)))
|
|
|
|
|
|
&& unsigned0 == unsigned1
|
|
|
|
|
|
&& (unsigned0 || !uns))
|
|
|
|
|
|
result_type
|
|
|
|
|
|
= c_common_signed_or_unsigned_type
|
|
|
|
|
|
(unsigned0, common_type (TREE_TYPE (arg0), TREE_TYPE (arg1)));
|
|
|
|
|
|
else if (TREE_CODE (arg0) == INTEGER_CST
|
|
|
|
|
|
&& (unsigned1 || !uns)
|
|
|
|
|
|
&& (TYPE_PRECISION (TREE_TYPE (arg1))
|
|
|
|
|
|
< TYPE_PRECISION (result_type))
|
|
|
|
|
|
&& (type
|
|
|
|
|
|
= c_common_signed_or_unsigned_type (unsigned1,
|
|
|
|
|
|
TREE_TYPE (arg1)),
|
|
|
|
|
|
int_fits_type_p (arg0, type)))
|
|
|
|
|
|
result_type = type;
|
|
|
|
|
|
else if (TREE_CODE (arg1) == INTEGER_CST
|
|
|
|
|
|
&& (unsigned0 || !uns)
|
|
|
|
|
|
&& (TYPE_PRECISION (TREE_TYPE (arg0))
|
|
|
|
|
|
< TYPE_PRECISION (result_type))
|
|
|
|
|
|
&& (type
|
|
|
|
|
|
= c_common_signed_or_unsigned_type (unsigned0,
|
|
|
|
|
|
TREE_TYPE (arg0)),
|
|
|
|
|
|
int_fits_type_p (arg1, type)))
|
|
|
|
|
|
result_type = type;
|
|
|
|
|
|
}
|
1994-01-22 23:18:10 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Shifts can be shortened if shifting right. */
|
2003-06-22 15:41:26 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (short_shift)
|
|
|
|
|
|
{
|
|
|
|
|
|
int unsigned_arg;
|
|
|
|
|
|
tree arg0 = get_narrower (op0, &unsigned_arg);
|
1994-01-22 23:18:10 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
final_type = result_type;
|
1995-01-28 21:14:09 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (arg0 == op0 && final_type == TREE_TYPE (op0))
|
builtins.c, [...]: Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* builtins.c, c-aux-info.c, c-common.c, c-cppbuiltin.c, c-decl.c:
Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* c-format.c, c-opts.c, c-pretty-print.c, c-typeck.c: Likewise.
* calls.c, convert.c, dbxout.c, dojump.c, dwarf2out.c: Likewise.
* expmed.c, expr.c, fold-const.c, function.c, integrate.c: Likewise.
* optabs.c, sdbout.c, stmt.c, stor-layout.c, tree-dump.c: Likewise.
* tree.c, config/iq2000/iq2000.c, config/m32r/m32r.c: Likewise.
* config/mips/mips.c, config/rs6000/rs6000.c: Likewise.
* config/s390/s390.c, config/sparc/sparc.c, objc/objc-act.c: Likewise.
* stor-layout.c (layout_type, case COMPLEX_TYPE): Test for
REAL_TYPE, not INTEGER_TYPE.
(layout_type, case VECTOR_TYPE): Simplify code.
* tree.c (build_vector_type_for_mode): Remove dup unsigned setting.
* tree.h: Update comments.
(STRIP_NOPS): Use TYPE_UNSIGNED.
(TYPE_UNSIGNED): New macro.
(TYPE_TRAP_SIGNED): Remove now redundant check.
(SAVE_EXPR_NOPLACEHOLDER): Don't use TREE_UNSIGNED.
* cp/call.c (joust): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* cp/class.c (check_bitfield_decl): Likewise.
* cp/cvt.c (type_promotes_to): Likewise.
* cp/decl.c (finish_enum): Likewise.
* cp/mangle.c (write_builtin_type): Likewise.
* cp/semantics.c (finish_switch_cond, finish_unary_op_expr): Likewise.
* cp/typeck.c (type_after_usual_arithmetic_conversions): Likewise.
(build_binary_op): Likewise.
* f/com.c (ffecom_arrayref_): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
(ffecom_expr_): Likewise.
* java/jcf-write.c (generate_bytecode_insns): Use TYPE_UNSIGNED.
* treelang/treetree.c (tree_lang_signed_or_unsigned_type):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/decl.c (gnat_to_gnu_entity, make_type_from_size):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/trans.c (tree_transform, convert_with_check): Likewise.
* ada/utils.c (gnat_signed_or_unsigned_type): Likewise.
(build_vms_descriptor, unchecked_convert): Likewise.
* ada/utils2.c (nonbinary_modular_operation): Likewise.
From-SVN: r80287
2004-04-01 05:50:43 +02:00
|
|
|
|
unsigned_arg = TYPE_UNSIGNED (TREE_TYPE (op0));
|
1997-11-02 22:19:36 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (TYPE_PRECISION (TREE_TYPE (arg0)) < TYPE_PRECISION (result_type)
|
|
|
|
|
|
/* We can shorten only if the shift count is less than the
|
|
|
|
|
|
number of bits in the smaller type size. */
|
|
|
|
|
|
&& compare_tree_int (op1, TYPE_PRECISION (TREE_TYPE (arg0))) < 0
|
|
|
|
|
|
/* We cannot drop an unsigned shift after sign-extension. */
|
builtins.c, [...]: Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* builtins.c, c-aux-info.c, c-common.c, c-cppbuiltin.c, c-decl.c:
Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* c-format.c, c-opts.c, c-pretty-print.c, c-typeck.c: Likewise.
* calls.c, convert.c, dbxout.c, dojump.c, dwarf2out.c: Likewise.
* expmed.c, expr.c, fold-const.c, function.c, integrate.c: Likewise.
* optabs.c, sdbout.c, stmt.c, stor-layout.c, tree-dump.c: Likewise.
* tree.c, config/iq2000/iq2000.c, config/m32r/m32r.c: Likewise.
* config/mips/mips.c, config/rs6000/rs6000.c: Likewise.
* config/s390/s390.c, config/sparc/sparc.c, objc/objc-act.c: Likewise.
* stor-layout.c (layout_type, case COMPLEX_TYPE): Test for
REAL_TYPE, not INTEGER_TYPE.
(layout_type, case VECTOR_TYPE): Simplify code.
* tree.c (build_vector_type_for_mode): Remove dup unsigned setting.
* tree.h: Update comments.
(STRIP_NOPS): Use TYPE_UNSIGNED.
(TYPE_UNSIGNED): New macro.
(TYPE_TRAP_SIGNED): Remove now redundant check.
(SAVE_EXPR_NOPLACEHOLDER): Don't use TREE_UNSIGNED.
* cp/call.c (joust): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* cp/class.c (check_bitfield_decl): Likewise.
* cp/cvt.c (type_promotes_to): Likewise.
* cp/decl.c (finish_enum): Likewise.
* cp/mangle.c (write_builtin_type): Likewise.
* cp/semantics.c (finish_switch_cond, finish_unary_op_expr): Likewise.
* cp/typeck.c (type_after_usual_arithmetic_conversions): Likewise.
(build_binary_op): Likewise.
* f/com.c (ffecom_arrayref_): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
(ffecom_expr_): Likewise.
* java/jcf-write.c (generate_bytecode_insns): Use TYPE_UNSIGNED.
* treelang/treetree.c (tree_lang_signed_or_unsigned_type):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/decl.c (gnat_to_gnu_entity, make_type_from_size):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/trans.c (tree_transform, convert_with_check): Likewise.
* ada/utils.c (gnat_signed_or_unsigned_type): Likewise.
(build_vms_descriptor, unchecked_convert): Likewise.
* ada/utils2.c (nonbinary_modular_operation): Likewise.
From-SVN: r80287
2004-04-01 05:50:43 +02:00
|
|
|
|
&& (!TYPE_UNSIGNED (final_type) || unsigned_arg))
|
2003-07-18 02:26:51 +02:00
|
|
|
|
{
|
|
|
|
|
|
/* Do an unsigned shift if the operand was zero-extended. */
|
|
|
|
|
|
result_type
|
|
|
|
|
|
= c_common_signed_or_unsigned_type (unsigned_arg,
|
|
|
|
|
|
TREE_TYPE (arg0));
|
|
|
|
|
|
/* Convert value-to-be-shifted to that type. */
|
|
|
|
|
|
if (TREE_TYPE (op0) != result_type)
|
|
|
|
|
|
op0 = convert (result_type, op0);
|
|
|
|
|
|
converted = 1;
|
1995-01-28 21:14:09 +01:00
|
|
|
|
}
|
1994-01-22 23:18:10 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Comparison operations are shortened too but differently.
|
|
|
|
|
|
They identify themselves by setting short_compare = 1. */
|
2000-09-10 23:34:41 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (short_compare)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Don't write &op0, etc., because that would prevent op0
|
|
|
|
|
|
from being kept in a register.
|
|
|
|
|
|
Instead, make copies of the our local variables and
|
|
|
|
|
|
pass the copies by reference, then copy them back afterward. */
|
|
|
|
|
|
tree xop0 = op0, xop1 = op1, xresult_type = result_type;
|
|
|
|
|
|
enum tree_code xresultcode = resultcode;
|
|
|
|
|
|
tree val
|
|
|
|
|
|
= shorten_compare (&xop0, &xop1, &xresult_type, &xresultcode);
|
2000-09-17 09:38:23 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (val != 0)
|
|
|
|
|
|
return val;
|
2000-09-17 09:38:23 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
op0 = xop0, op1 = xop1;
|
|
|
|
|
|
converted = 1;
|
|
|
|
|
|
resultcode = xresultcode;
|
2000-09-17 09:38:23 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (warn_sign_compare && skip_evaluation == 0)
|
|
|
|
|
|
{
|
builtins.c, [...]: Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* builtins.c, c-aux-info.c, c-common.c, c-cppbuiltin.c, c-decl.c:
Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* c-format.c, c-opts.c, c-pretty-print.c, c-typeck.c: Likewise.
* calls.c, convert.c, dbxout.c, dojump.c, dwarf2out.c: Likewise.
* expmed.c, expr.c, fold-const.c, function.c, integrate.c: Likewise.
* optabs.c, sdbout.c, stmt.c, stor-layout.c, tree-dump.c: Likewise.
* tree.c, config/iq2000/iq2000.c, config/m32r/m32r.c: Likewise.
* config/mips/mips.c, config/rs6000/rs6000.c: Likewise.
* config/s390/s390.c, config/sparc/sparc.c, objc/objc-act.c: Likewise.
* stor-layout.c (layout_type, case COMPLEX_TYPE): Test for
REAL_TYPE, not INTEGER_TYPE.
(layout_type, case VECTOR_TYPE): Simplify code.
* tree.c (build_vector_type_for_mode): Remove dup unsigned setting.
* tree.h: Update comments.
(STRIP_NOPS): Use TYPE_UNSIGNED.
(TYPE_UNSIGNED): New macro.
(TYPE_TRAP_SIGNED): Remove now redundant check.
(SAVE_EXPR_NOPLACEHOLDER): Don't use TREE_UNSIGNED.
* cp/call.c (joust): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* cp/class.c (check_bitfield_decl): Likewise.
* cp/cvt.c (type_promotes_to): Likewise.
* cp/decl.c (finish_enum): Likewise.
* cp/mangle.c (write_builtin_type): Likewise.
* cp/semantics.c (finish_switch_cond, finish_unary_op_expr): Likewise.
* cp/typeck.c (type_after_usual_arithmetic_conversions): Likewise.
(build_binary_op): Likewise.
* f/com.c (ffecom_arrayref_): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
(ffecom_expr_): Likewise.
* java/jcf-write.c (generate_bytecode_insns): Use TYPE_UNSIGNED.
* treelang/treetree.c (tree_lang_signed_or_unsigned_type):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/decl.c (gnat_to_gnu_entity, make_type_from_size):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/trans.c (tree_transform, convert_with_check): Likewise.
* ada/utils.c (gnat_signed_or_unsigned_type): Likewise.
(build_vms_descriptor, unchecked_convert): Likewise.
* ada/utils2.c (nonbinary_modular_operation): Likewise.
From-SVN: r80287
2004-04-01 05:50:43 +02:00
|
|
|
|
int op0_signed = ! TYPE_UNSIGNED (TREE_TYPE (orig_op0));
|
|
|
|
|
|
int op1_signed = ! TYPE_UNSIGNED (TREE_TYPE (orig_op1));
|
2003-07-18 02:26:51 +02:00
|
|
|
|
int unsignedp0, unsignedp1;
|
|
|
|
|
|
tree primop0 = get_narrower (op0, &unsignedp0);
|
|
|
|
|
|
tree primop1 = get_narrower (op1, &unsignedp1);
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
xop0 = orig_op0;
|
|
|
|
|
|
xop1 = orig_op1;
|
|
|
|
|
|
STRIP_TYPE_NOPS (xop0);
|
|
|
|
|
|
STRIP_TYPE_NOPS (xop1);
|
1999-08-27 09:37:16 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Give warnings for comparisons between signed and unsigned
|
|
|
|
|
|
quantities that may fail.
|
1999-08-27 09:37:16 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
Do the checking based on the original operand trees, so that
|
|
|
|
|
|
casts will be considered, but default promotions won't be.
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
Do not warn if the comparison is being done in a signed type,
|
|
|
|
|
|
since the signed type will only be chosen if it can represent
|
|
|
|
|
|
all the values of the unsigned type. */
|
builtins.c, [...]: Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* builtins.c, c-aux-info.c, c-common.c, c-cppbuiltin.c, c-decl.c:
Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* c-format.c, c-opts.c, c-pretty-print.c, c-typeck.c: Likewise.
* calls.c, convert.c, dbxout.c, dojump.c, dwarf2out.c: Likewise.
* expmed.c, expr.c, fold-const.c, function.c, integrate.c: Likewise.
* optabs.c, sdbout.c, stmt.c, stor-layout.c, tree-dump.c: Likewise.
* tree.c, config/iq2000/iq2000.c, config/m32r/m32r.c: Likewise.
* config/mips/mips.c, config/rs6000/rs6000.c: Likewise.
* config/s390/s390.c, config/sparc/sparc.c, objc/objc-act.c: Likewise.
* stor-layout.c (layout_type, case COMPLEX_TYPE): Test for
REAL_TYPE, not INTEGER_TYPE.
(layout_type, case VECTOR_TYPE): Simplify code.
* tree.c (build_vector_type_for_mode): Remove dup unsigned setting.
* tree.h: Update comments.
(STRIP_NOPS): Use TYPE_UNSIGNED.
(TYPE_UNSIGNED): New macro.
(TYPE_TRAP_SIGNED): Remove now redundant check.
(SAVE_EXPR_NOPLACEHOLDER): Don't use TREE_UNSIGNED.
* cp/call.c (joust): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* cp/class.c (check_bitfield_decl): Likewise.
* cp/cvt.c (type_promotes_to): Likewise.
* cp/decl.c (finish_enum): Likewise.
* cp/mangle.c (write_builtin_type): Likewise.
* cp/semantics.c (finish_switch_cond, finish_unary_op_expr): Likewise.
* cp/typeck.c (type_after_usual_arithmetic_conversions): Likewise.
(build_binary_op): Likewise.
* f/com.c (ffecom_arrayref_): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
(ffecom_expr_): Likewise.
* java/jcf-write.c (generate_bytecode_insns): Use TYPE_UNSIGNED.
* treelang/treetree.c (tree_lang_signed_or_unsigned_type):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/decl.c (gnat_to_gnu_entity, make_type_from_size):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/trans.c (tree_transform, convert_with_check): Likewise.
* ada/utils.c (gnat_signed_or_unsigned_type): Likewise.
(build_vms_descriptor, unchecked_convert): Likewise.
* ada/utils2.c (nonbinary_modular_operation): Likewise.
From-SVN: r80287
2004-04-01 05:50:43 +02:00
|
|
|
|
if (! TYPE_UNSIGNED (result_type))
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* OK */;
|
|
|
|
|
|
/* Do not warn if both operands are the same signedness. */
|
|
|
|
|
|
else if (op0_signed == op1_signed)
|
|
|
|
|
|
/* OK */;
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
tree sop, uop;
|
2000-09-17 09:38:23 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (op0_signed)
|
|
|
|
|
|
sop = xop0, uop = xop1;
|
|
|
|
|
|
else
|
|
|
|
|
|
sop = xop1, uop = xop0;
|
2000-09-17 09:38:23 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Do not warn if the signed quantity is an
|
|
|
|
|
|
unsuffixed integer literal (or some static
|
|
|
|
|
|
constant expression involving such literals or a
|
|
|
|
|
|
conditional expression involving such literals)
|
|
|
|
|
|
and it is non-negative. */
|
2004-06-21 11:15:29 +02:00
|
|
|
|
if (tree_expr_nonnegative_p (sop))
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* OK */;
|
|
|
|
|
|
/* Do not warn if the comparison is an equality operation,
|
|
|
|
|
|
the unsigned quantity is an integral constant, and it
|
|
|
|
|
|
would fit in the result if the result were signed. */
|
|
|
|
|
|
else if (TREE_CODE (uop) == INTEGER_CST
|
|
|
|
|
|
&& (resultcode == EQ_EXPR || resultcode == NE_EXPR)
|
|
|
|
|
|
&& int_fits_type_p
|
|
|
|
|
|
(uop, c_common_signed_type (result_type)))
|
|
|
|
|
|
/* OK */;
|
|
|
|
|
|
/* Do not warn if the unsigned quantity is an enumeration
|
|
|
|
|
|
constant and its maximum value would fit in the result
|
|
|
|
|
|
if the result were signed. */
|
|
|
|
|
|
else if (TREE_CODE (uop) == INTEGER_CST
|
|
|
|
|
|
&& TREE_CODE (TREE_TYPE (uop)) == ENUMERAL_TYPE
|
|
|
|
|
|
&& int_fits_type_p
|
|
|
|
|
|
(TYPE_MAX_VALUE (TREE_TYPE(uop)),
|
|
|
|
|
|
c_common_signed_type (result_type)))
|
|
|
|
|
|
/* OK */;
|
|
|
|
|
|
else
|
|
|
|
|
|
warning ("comparison between signed and unsigned");
|
|
|
|
|
|
}
|
2000-09-17 09:38:23 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* Warn if two unsigned values are being compared in a size
|
|
|
|
|
|
larger than their original size, and one (and only one) is the
|
|
|
|
|
|
result of a `~' operator. This comparison will always fail.
|
2000-09-17 09:38:23 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
Also warn if one operand is a constant, and the constant
|
|
|
|
|
|
does not have all bits set that are set in the ~ operand
|
|
|
|
|
|
when it is extended. */
|
2000-09-17 09:38:23 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if ((TREE_CODE (primop0) == BIT_NOT_EXPR)
|
|
|
|
|
|
!= (TREE_CODE (primop1) == BIT_NOT_EXPR))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (TREE_CODE (primop0) == BIT_NOT_EXPR)
|
|
|
|
|
|
primop0 = get_narrower (TREE_OPERAND (primop0, 0),
|
|
|
|
|
|
&unsignedp0);
|
|
|
|
|
|
else
|
|
|
|
|
|
primop1 = get_narrower (TREE_OPERAND (primop1, 0),
|
|
|
|
|
|
&unsignedp1);
|
2000-12-20 19:18:24 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (host_integerp (primop0, 0) || host_integerp (primop1, 0))
|
|
|
|
|
|
{
|
|
|
|
|
|
tree primop;
|
|
|
|
|
|
HOST_WIDE_INT constant, mask;
|
|
|
|
|
|
int unsignedp, bits;
|
2003-03-04 12:06:32 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (host_integerp (primop0, 0))
|
|
|
|
|
|
{
|
|
|
|
|
|
primop = primop1;
|
|
|
|
|
|
unsignedp = unsignedp1;
|
|
|
|
|
|
constant = tree_low_cst (primop0, 0);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
primop = primop0;
|
|
|
|
|
|
unsignedp = unsignedp0;
|
|
|
|
|
|
constant = tree_low_cst (primop1, 0);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bits = TYPE_PRECISION (TREE_TYPE (primop));
|
|
|
|
|
|
if (bits < TYPE_PRECISION (result_type)
|
|
|
|
|
|
&& bits < HOST_BITS_PER_WIDE_INT && unsignedp)
|
|
|
|
|
|
{
|
|
|
|
|
|
mask = (~ (HOST_WIDE_INT) 0) << bits;
|
|
|
|
|
|
if ((mask & constant) != mask)
|
|
|
|
|
|
warning ("comparison of promoted ~unsigned with constant");
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (unsignedp0 && unsignedp1
|
|
|
|
|
|
&& (TYPE_PRECISION (TREE_TYPE (primop0))
|
|
|
|
|
|
< TYPE_PRECISION (result_type))
|
|
|
|
|
|
&& (TYPE_PRECISION (TREE_TYPE (primop1))
|
|
|
|
|
|
< TYPE_PRECISION (result_type)))
|
|
|
|
|
|
warning ("comparison of promoted ~unsigned with unsigned");
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
2003-03-04 12:06:32 +01:00
|
|
|
|
}
|
2000-12-20 19:18:24 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
/* At this point, RESULT_TYPE must be nonzero to avoid an error message.
|
|
|
|
|
|
If CONVERTED is zero, both args will be converted to type RESULT_TYPE.
|
|
|
|
|
|
Then the expression will be built.
|
|
|
|
|
|
It will be given type FINAL_TYPE if that is nonzero;
|
|
|
|
|
|
otherwise, it will be given type RESULT_TYPE. */
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (!result_type)
|
|
|
|
|
|
{
|
|
|
|
|
|
binary_op_error (code);
|
|
|
|
|
|
return error_mark_node;
|
|
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (! converted)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (TREE_TYPE (op0) != result_type)
|
|
|
|
|
|
op0 = convert (result_type, op0);
|
|
|
|
|
|
if (TREE_TYPE (op1) != result_type)
|
|
|
|
|
|
op1 = convert (result_type, op1);
|
|
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (build_type == NULL_TREE)
|
|
|
|
|
|
build_type = result_type;
|
1992-02-28 19:53:39 +01:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
{
|
|
|
|
|
|
tree result = build (resultcode, build_type, op0, op1);
|
|
|
|
|
|
|
|
|
|
|
|
/* Treat expressions in initializers specially as they can't trap. */
|
2004-06-07 20:49:36 +02:00
|
|
|
|
result = require_constant_value ? fold_initializer (result)
|
|
|
|
|
|
: fold (result);
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
2003-07-18 02:26:51 +02:00
|
|
|
|
if (final_type != 0)
|
2004-05-13 08:41:07 +02:00
|
|
|
|
result = convert (final_type, result);
|
|
|
|
|
|
return result;
|
2003-07-18 02:26:51 +02:00
|
|
|
|
}
|
1992-02-28 19:53:39 +01:00
|
|
|
|
}
|
2003-07-18 02:26:51 +02:00
|
|
|
|
|
2004-06-01 17:12:23 +02:00
|
|
|
|
/* Build the result of __builtin_offsetof. TYPE is the first argument to
|
|
|
|
|
|
offsetof, i.e. a type. LIST is a tree_list that encodes component and
|
|
|
|
|
|
array references; PURPOSE is set for the former and VALUE is set for
|
|
|
|
|
|
the later. */
|
|
|
|
|
|
|
|
|
|
|
|
tree
|
|
|
|
|
|
build_offsetof (tree type, tree list)
|
|
|
|
|
|
{
|
|
|
|
|
|
tree t;
|
|
|
|
|
|
|
|
|
|
|
|
/* Build "*(type *)0". */
|
|
|
|
|
|
t = convert (build_pointer_type (type), null_pointer_node);
|
|
|
|
|
|
t = build_indirect_ref (t, "");
|
|
|
|
|
|
|
|
|
|
|
|
/* Build COMPONENT and ARRAY_REF expressions as needed. */
|
|
|
|
|
|
for (list = nreverse (list); list ; list = TREE_CHAIN (list))
|
|
|
|
|
|
if (TREE_PURPOSE (list))
|
|
|
|
|
|
t = build_component_ref (t, TREE_PURPOSE (list));
|
|
|
|
|
|
else
|
|
|
|
|
|
t = build_array_ref (t, TREE_VALUE (list));
|
|
|
|
|
|
|
|
|
|
|
|
/* Finalize the offsetof expression. For now all we need to do is take
|
|
|
|
|
|
the address of the expression we created, and cast that to an integer
|
|
|
|
|
|
type; this mirrors the traditional macro implementation of offsetof. */
|
|
|
|
|
|
t = build_unary_op (ADDR_EXPR, t, 0);
|
|
|
|
|
|
return convert (size_type_node, t);
|
|
|
|
|
|
}
|