2015-01-09 Michael Collison <michael.collison@linaro.org> * genattrtab.c (write_header): Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h fold-const.h, wide-int.h, and inchash.h when generating insn-attrtab.c. * genautomata.c (main) : Include hash-set.h, macInclude hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h fold-const.h, wide-int.h, and inchash.h when generating insn-automata.c. * genemit.c (main): Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h fold-const.h, wide-int.h, and inchash.h when generating insn-emit.c. * gengtype.c (open_base_files): Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h fold-const.h, wide-int.h, and inchash.h when generating gtype-desc.c. * genopinit.c (main): Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h fold-const.h, wide-int.h, and inchash.h when generating insn-opinit.c. * genoutput.c (output_prologue): Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h fold-const.h, wide-int.h, and inchash.h when generating insn-output.c. * genpeep.c (main): Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h fold-const.h, wide-int.h, and inchash.h when generating insn-peep.c. * genpreds.c (write_insn_preds_c): Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h fold-const.h, wide-int.h, and inchash.h when generating insn-preds.c. * optc-save-gen-awk: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h fold-const.h, wide-int.h, and inchash.h when generating options-save.c. * opth-gen.awk: Change include guard from GCC_C_COMMON_H to GCC_C_COMMON_C when generating options.h. * ada/gcc-interface/cuintp.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * ada/gcc-interface/decl.c: ditto. * ada/gcc-interface/misc.c: ditto. * ada/gcc-interface/targtyps.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * ada/gcc-interface/trans.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, real.h, fold-const.h, wide-int.h, inchash.h due to flattening of tree.h. * ada/gcc-interface/utils.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * ada/gcc-interface/utils2.c: ditto. * alias.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * asan.c: ditto. * attribs.c: ditto. * auto-inc-dec.c: ditto. * auto-profile.c: ditto * bb-reorder.c: ditto. * bt-load.c: Include symtab.h due to flattening of tree.h. * builtins.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * c/c-array-notation.c: ditto. * c/c-aux-info.c: ditto. * c/c-convert.c: ditto. * c/c-decl.c: ditto. * c/c-errors.c: ditto. * c/c-lang.c: dittoxs. * c/c-objc-common.c: ditto. * c/c-parser.c: ditto. * c/c-typeck.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h fold-const.h, wide-int.h, inchash.h, real.h and fixed-value.h due to flattening of tree.h. * calls.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * ccmp.c: ditto. * c-family/array-notation-common.c: ditto. * c-family/c-ada-spec.c: ditto. * c-family/c-cilkplus.c: ditto. * c-family/c-common.c: Include input.h due to flattening of tree.h. Define macro GCC_C_COMMON_C. * c-family/c-common.h: Flatten tree.h header files into c-common.h. Remove include of tree-core.h. * c-family/c-cppbuiltin.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * c-family/c-dump.c: ditto. * c-family/c-format.c: Flatten tree.h header files into c-common.h. * c-family/c-cppbuiltin.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * c-family/c-dump.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * c-family/c-format.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h fold-const.h, wide-int.h, inchash.h and real.h due to flattening of tree.h. * c-family/c-gimplify.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * c-family/cilk.c: ditto. * c-family/c-lex.c: ditto. * c-family/c-omp.c: ditto. * c-family/c-opts.c: ditto. * c-family/c-pch.c: ditto. * c-family/c-ppoutput.c: ditto. * c-family/c-pragma.c: ditto. * c-family/c-pretty-print.c: ditto. * c-family/c-semantics.c: ditto. * c-family/c-ubsan.c: ditto. * c-family/stub-objc.c: ditto. * cfgbuild.c: ditto. * cfg.c: ditto. * cfgcleanup.c: ditto. * cfgexpand.c: ditto. * cfghooks.c: ditto. * cfgloop.c: Include symtab.h, fold-const.h, and inchash.h due to flattening of tree.h. * cfgloopmanip.c: ditto. * cfgrtl.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * cgraphbuild.c: ditto. * cgraph.c: ditto. * cgraphclones.c: ditto. * cgraphunit.c: ditto. * cilk-common.c: ditto. * combine.c: ditto. * combine-stack-adj.c: Include symbol.h due to flattening of tree.h. * config/aarch64/aarch64-builtins.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * config/aarch64/aarch64.c: ditto. * config/alpha/alpha.c: ditto. * config/arc/arc.c: ditto. * config/arm/aarch-common.c: ditto. * config/arm/arm-builtins.c: ditto. * config/arm/arm.c: ditto. * config/arm/arm-c.c: ditto. * config/avr/avr.c: ditto. * config/avr/avr-c.c: ditto. * config/avr/avr-log.c: ditto. * config/bfin/bfin.c: ditto. * config/c6x/c6x.c: ditto. * config/cr16/cr16.c: ditto. * config/cris/cris.c: ditto. * config/darwin.c: ditto. * config/darwin-c.c: ditto. * config/default-c.c: ditto. * config/epiphany/epiphany.c: ditto. * config/fr30/fr30.c: ditto. * config/frv/frv.c: ditto. * config/glibc-c.c: ditto. * config/h8300/h8300.c: ditto. * config/i386/i386.c: ditto. * config/i386/i386-c.c: ditto. * config/i386/msformat.c: ditto. * config/i386/winnt.c: ditto. * config/i386/winnt-cxx.c: ditto. * config/i386/winnt-stubs.c: ditto. * config/ia64/ia64.c: ditto. * config/ia64/ia64-c.c: ditto. * config/iq2000/iq2000.c: ditto. * config/lm32/lm32.c: Include symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * config/m32c/m32c.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * config/m32c/m32c-pragma.c: ditto. * config/m32c/m32cr.c: ditto. * config/m68/m68k.c: ditto. * config/mcore/mcore.c: ditto. * config/mep/mep.c: ditto. * config/mep/mep-pragma.c: ditto. * config/microblaze/microblaze.c: ditto. * config/microblaze/microblaze-c.c: ditto. * config/mips/mips.c: ditto. * config/mmix/mmix.c: Include symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * config/mn10300/mn10300.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * config/moxie/moxie.c: ditto. * config/msp430/msp430.c: ditto. * config/msp430/msp430-c.c: ditto. * config/nds32/nds32.c: ditto. * config/nds32/nds32-cost.c: ditto. * config/nds32/nds32-fp-as-gp.c: ditto. * config/nds32/nds32-intrinsic.c: ditto. * config/nds32/nds32-isr.c: ditto. * config/nds32/nds32-md-auxillary.c: ditto. * config/nds32/nds32-memory-manipulationx.c: ditto. * config/nds32/nds32-pipelines-auxillary.c: ditto. * config/nds32/nds32-predicates.c: ditto. * config/nios2/nios2.c: ditto. * config/nvptx/nvptx.c: ditto. * config/pa/pa.c: ditto. * config/pdp11/pdp11x.c: Include symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * config/rl78/rl78.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * config/rl78/rl78-cx.c: ditto. * config/rs6000/rs6000.c: ditto. * config/rs6000/rs6000-c.c: ditto. * config/rx/rx.c: ditto. * config/s390/s390.c: ditto. * config/sh/sh.c: ditto. * config/sh/sc.c: ditto. * config/sh/sh-mem.cc: ditto. * config/sh/sh_treg_combine.cc: Include symtab.h, inchash.h and tree.h due to flattening of tree.h. Remove include of tree-core.h. * config/sol2.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * config/sol2-c.c: ditto. * config/sol2-cxx.c: ditto. * config/sol2-stubs.c: ditto. * config/sparc/sparc.c: ditto. * config/sparc/sparc-cx.c: ditto. * config/spu/spu.c: ditto. * config/spu/spu-c.c: ditto * config/storym16/stormy16.c: ditto. * config/tilegx/tilegx.c: Include symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * config/tilepro/gen-mul-tables.cc: Include symtab.h in generated file. * config/tilegx/tilegx-c.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * config/tilepro/tilepro.c: Include symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * config/tilepro/tilepro-c.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * config/v850/v850.c: ditto. * config/v850/v850-c.c: ditto. * config/vax/vax.c: ditto. * config/vms/vms.c: ditto. * config/vms/vms-c.c: ditto. * config/vxworks.c: ditto. * config/winnt-c.c: ditto. * config/xtensa/xtensa.c: Include symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * convert.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * coverage.c: ditto. * cp/call.c: ditto. * cp/class.c: ditto. * cp/constexpr.c: ditto. * cp/cp-array-notation.c: ditto. * cp/cp-gimplify.c: ditto. * cp/cp-lang.c: ditto. * cp/cp-objcp-common.c: ditto. * cp/cvt.c: ditto. * cp/decl2.c: ditto. * cp/decl.c: ditto. * cp/dump.c: ditto. * cp/error.c: ditto. * cp/except.c: ditto. * cp/expr.c: ditto. * cp/friend.c: ditto. * cp/init.c: ditto. * cp/lambda.c: ditto. * cp/lex.c: ditto. * cp/mangle.c: ditto. * cp/name-lookup.c: ditto. * cp/optimize.c: ditto. * cp/parser.c: ditto. * cp/pt.c: ditto. * cp/ptree.c: ditto. * cp/repo.c: ditto. * cp/rtti.c: ditto. * cp/search.c: ditto. * cp/semantics.c: ditto. * cp/tree.c: ditto. * cp/typeck2.c: ditto. * cp/typeck.c: ditto. * cppbuiltin.c: ditto. * cprop.c: ditto. * cse.c: Add include of symtab.h due to flattening of tree.h. * cselib.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * data-streamer.c: ditto. * data-streamer-in.c: ditto. * data-streamer-out.c: ditto. * dbxout.c: ditto. * dce.c: ditto. * ddg.c: Add include of symtab.h due to flattening of tree.h. * debug.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * dfp.c: ditto. * df-scan.c: ditto. * dojump.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h, inchash.h and real.h due to flattening of tree.h. * double-int.c: ditto. * dse.c: ditto. * dumpfile.c: ditto. * dwarf2asm.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, inchash.h and real.h due to flattening of tree.h. * dwarf2cfi.c: ditto. * dwarf2out.c: ditto. * emit-rtl.c: ditto. * except.c: ditto. * explow.c: ditto. * expmed.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * expr.c: ditto. * final.c: ditto. * fixed-value.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, inchash.h and fixed-value.h due to flattening of tree.h. * fold-const.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. Relocate inline function convert_to_ptrofftype_loc from tree.h. Relocate inline function fold_build_pointer_plus_loc from tree.h. Relocate inline function fold_build_pointer_plus_hwi_loc from tree.h. * fold-const.h: Relocate macro convert_to_ptrofftype from tree.h. Relocate macro fold_build_pointer_plus to relocate from tree.h.h. Relocate macro fold_build_pointer_plus_hwi from tree.h. Add prototype for convert_to_ptrofftype_loc relocated from tree.h. Add prototype for fold_build_pointer_plus_loc relocated from tree.h. Add prototype for fold_build_pointer_plus_hwi_loc relocated from tree.h. * fortran/convert.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * fortran/cpp.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * fortran/decl.c: ditto. * fortran/f95.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * fortran/iresolve.c: ditto. * fortran/match.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * fortran/module.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * fortran/options.c: ditto. * fortran/target-memory.c: Include hash-set.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * fortran/trans-array.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * fortran/trans.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * fortran/trans-common.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * fortran/trans-const.c: ditto. * fortran/trans-decl.c: ditto. * fortran/trans-expr.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * fortran/trans-intrinsic.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, inchash.h and real.h due to flattening of tree.h. * fortran/trans-io.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * fortran/trans-openmp.c: ditto. * fortran/trans-stmt.c: ditto. * fortran/trans-types.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, inchash.h and real.h due to flattening of tree.h. * function.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * gcc-plugin.h: Include statistics.h, double-int.h, real.h, fixed-value.h, alias.h, flags.h, and symtab.h due to flattening of tree.h * gcse.c: ditto. * generic-match-head.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * ggc-page.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * gimple-builder.c: ditto. * gimple.c: ditto. * gimple-expr.c: ditto. * gimple-fold.c: ditto. * gimple-iterator.c: ditto. * gimple-low.c: ditto. * gimple-match-head.c: ditto. * gimple-pretty-print.c: ditto. * generic-ssa-isolate-paths.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * gimple-ssa-strength-reduction.c: ditto. * gimple-streamer-in.c: ditto. * gimple-streamer-out.c: ditto. * gimple-walk.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * gimplify.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * gimplify-me.c: ditto. * go/go-gcc.cc: ditto. * go/go-lang.c: ditto. * go/gdump.c: ditto. * graphite-blocking.c: ditto. * graphite.c: ditto. * graphite-dependencies.c: ditto. * graphite-interchange.c: ditto. * graphite-isl-ast-to-gimple.c: ditto. * graphite-optimize-isl.c: ditto. * graphite-poly.c: ditto. * graphite-scop-detection.c: ditto. * graphite-sese-to-poly.c: ditto. * hw-doloop.c: Include symtab.h due to flattening of tree.h. * ifcvt.c: ditto. * init-regs.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * internal-fc.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h,options.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * ipa.c: ditto. * ipa-chkp.c: ditto. * ipa-comdats.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * ipa-cp.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h,options.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * ipa-devirt.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * ipa-icf.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h,options.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * ipa-icf-gimple.c: ditto. * ipa-inline-analysis.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * ipa-inline.c: ditto. * ipa-inline-transform.c: ditto. * ipa-polymorhpic-call.c: ditto. * ipa-profile.c: ditto. * ipa-prop.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * ipa-pure-const.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * ipa-ref.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * ipa-reference.c: ditto. * ipa-split.c: ditto. * ipa-utils.c: ditto. * ipa-visbility.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * ira.c: ditto. * ira-color.c: Include hash-set.h due to flattening of tree.h. * ira-costs.c: ditto. * ira-emit.c: ditto. * java/boehm.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * java/builtins.c: ditto. * java/class.c: ditto. * java/constants.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * java/decl.c: ditto. * java/except.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * java/expr.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h,inchash.h and real.h due to flattening of tree.h. * java/gimplify.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * java/jcf-dump.c: ditto. * java/jcf-io.c: ditto. * java/jcf-parse.c: ditto. * java/jvgenmain.c: ditto. * java/lang.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * java/mangle.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * java/mangle_name.c: ditto. * java/resource.c: ditto. * java/typeck.c: ditto. * java/verify-glue.c: ditto. * java/verify-impl.c: ditto. * jump.c: Include symtab.h due to flattening of tree.h. * langhooks.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * loop-doloop.c: Include symtab.h due to flattening of tree.h. * loop-init.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * loop-invariant.c: Include symtab.h due to flattening of tree.h. * loop-iv.c: ditto. * loop-unroll.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * lower-subreg.c: ditto. * lra-assigns.c: Include symtab.h due to flattening of tree.h. * lra.c: Include symtab.h, fold-const.h, wide-int.h and inchash.h due to flattening of tree.h. * lra-coalesce.c: Include symtab.h due to flattening of tree.h. * lra-constraints.c: ditto. * lra-eliminations.c: ditto. * lra-livesc: ditto. * lra-remat.c: ditto. * lra-spills.c: ditto. * lto/lto.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * lto/lto-lang.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * lto/lto-object.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * lto/lto-partition.c: ditto. * lto/lto-symtab.c: ditto. * lto-cgraph.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * lto-compress.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * lto-opts.c: ditto. * lto-section-in.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * lto-section-out.c: ditto. * lto-streamer.c: ditto. * lto-streamer-in.c: ditto. * lto-streamer-out.c: ditto. * modulo-sched.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * objc/objc-act.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * objc/objc-encoding.c: ditto. * objc/objc-gnu-runtime-abi-01.c: ditto. * objc/objc-lang.c: ditto. * objc/objc-map.c: ditto. * objc/objc-next-runtime-abi-01.c: ditto. * objc/objc-next-runtime-abi-02.c: ditto. * objc/objc-runtime-shared-support.c: ditto. * objcp/objcp-decl.c: ditto. * objcp/objcp-lang.c: ditto. * omega.c: ditto. * omega-low.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * optabs.c: ditto. * opts-global.c: ditto. * passes.c: ditto. * plugin.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * postreload.c: Include symtab.h due to flattening of tree.h. * postreload-gcse.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * predict.c: ditto. * print-rtl.c: ditto. * print-tree.c: ditto. * profile.c: Include symtab.h, fold-const.h and inchash.h due to flattening of tree.h. * real.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * realmpfr.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * recog.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * ree.c: ditto. * reginfo.c: ditto. * reg-stack.c: ditto. * reload1.c: Include symtab.h, fold-const.h, wide-int.h and inchash.h due to flattening of tree.h. * reload.c: Include symtab.h due to flattening of tree.h. * reorg.c: ditto. * rtlanal.c: Include symtab.h, fold-const.h, wide-int.h and inchash.h due to flattening of tree.h. * rtl-chkp.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * rtlhooks.c: Include symtab.h due to flattening of tree.h. * sanopt.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * sched-deps.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * sched-vis.c: ditto. * sdbout.c: ditto. * sel-sched.c: Include symtab.h, fold-const.h, wide-int.h and inchash.h due to flattening of tree.h. * sel-sched-ir.c: ditto. * sese.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * shrink-wrap.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * simplify-rtx.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * stack-ptr-mod.c: ditto. * stmt.c: ditto. * store-motion.c: ditto. * store-layout.c: ditto. * stringpool.c: ditto. * symtab.c: ditto. * target-globals.c: ditto. * targhooks.c: ditto. * toplev.c: ditto. * tracer.c: ditto. * trans-mem.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * tree-affine.c: ditto. * tree-browser.c: ditto. * tree.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * tree-call-cdce.c: Include symtab.h, alias.h, double-int.h, fold-const.h, wide-int.h, inchash.h and real.h due to flattening of tree.h. * tree-cfg.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * tree-cfgcleanup.c: ditto. * tree-chkp.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * tree-chkp-opt.c: ditto. * tree-chrec.c: ditto. * tree-chkp-opt.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, inchash.h and real.h due to flattening of tree.h. * tree-core.h: Flatten header file by removing all #include statements. * tree-data-ref.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * tree-dfa.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, inchash.h and real.h due to flattening of tree.h. * tree-diagnostic.c: ditto. * tree-dump.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, inchash.h, real.h and fixed-value.h due to flattening of tree.h. * tree-dfa.c: ditto. * tree-eh.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, inchash.h and real.h due to flattening of tree.h. * tree-emutls.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * tree.h: Flatten header files by removing all includes except tree-core.h. Remove inline function convert_to_ptrofftype_loc to relocate to fold-const.c. Remove macro convert_to_ptrofftype to relocate to fold-const.h. Remove inline function fold_build_pointer_plus_loc to relocate to fold-const.c. Remove macro fold_build_pointer_plus to relocate to fold-const.h. Remove inline function fold_build_pointer_plus_hwi_loc to relocate to fold-const.c. Remove macro fold_build_pointer_plus_hwi to relocate to fold-const.h. * tree-if-conv.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, inchash.h, real.h and fixed-value.h due to flattening of tree.h. * tree-inline.c: ditto. * tree-into-ssa.c: ditto. * tree-iterator.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * tree-loop-distribution.c: ditto. * tree-nested.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h and inchash.h due to flattening of tree.h. * tree-nrv.c: ditto. * tree-object-size.c: ditto. * tree-outof-ssa.c: ditto. * tree-parloops.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * tree-phinodes.c: ditto. * tree-predcom.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h and inchash.h due to flattening of tree.h. * tree-pretty-print.c: ditto. * tree-profile.c: double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h and inchash.h due to flattening of tree.h. * tree-scalar-evolution.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h and inchash.h due to flattening of tree.h. * tree-sra.c: Include vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, and inchash.h due to flattening of tree.h. * tree-ssa-alias.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h and inchash.h due to flattening of tree.h. * tree-ssa.c: ditto. * tree-ssa-ccp.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, inchash.h and real.h due to flattening of tree.h. * tree-ssa-coalesce.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h and inchash.h due to flattening of tree.h. * tree-ssa-copy.c: ditto. * tree-ssa-copyrename.c: ditto. * tree-ssa-dce.c: ditto. * tree-ssa-dom.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h, inchash.h and real.h due to flattening of tree.h. * tree-ssa-dse.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h and inchash.h due to flattening of tree.h. * tree-ssa-forwprop.c: ditto. * tree-ssa-ifcombine.c: ditto. * tree-ssa-live.c: ditto. * tree-ssa-loop.c: ditto. * tree-ssa-loop-ch.c: ditto. * tree-ssa-loop-im.c: ditto. * tree-ssa-loop-ivcanon.c: ditto. * tree-ssa-loop-ivopts.c: ditto. * tree-ssa-loop-manip.c: ditto. * tree-ssa-loop-niter.c: ditto. * tree-ssa-loop-prefetch.c: ditto. * tree-ssa-loop-unswitch.c: ditto. * tree-ssa-loop-math-opts.c: ditto. * tree-ssanames.c: ditto. * tree-ssa-operands.c: ditto. * tree-ssa-phiopt.c: ditto. * tree-ssa-phiprop.c: ditto. * tree-ssa-pre.c: ditto. * tree-ssa-propagate.c: ditto. * tree-ssa-reassoc.c: ditto. * tree-ssa-sccvn.c: ditto. * tree-ssa-sink.c: ditto. * tree-ssa-strlen.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h and inchash.h due to flattening of tree.h. * tree-ssa-structalias.c: double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h and inchash.h due to flattening of tree.h. * tree-ssa-tail-merge.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h and inchash.h due to flattening of tree.h. * tree-ssa-ter.c: ditto. * tree-ssa-threadedge.c: ditto. * tree-ssa-threadupdate.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h and inchash.h due to flattening of tree.h. * tree-ssa-uncprop.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h and inchash.h due to flattening of tree.h. * tree-ssa-uninit.c: ditto. * tree-stdarg.c: Include vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h and inchash.h due to flattening of tree.h. * tree-streamer.c: Include vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h and inchash.h due to flattening of tree.h. * tree-streamer-in.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h, inchash.h, real.h and fixed-value.h due to flattening of tree.h. * tree-streamer-out.c: dittoo. * tree-switch-conversion.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h and inchash.h due to flattening of tree.h. * tree-tailcall.c: ditto. * tree-vect-data-refs.c: ditto. * tree-vect-generic.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h and inchash.h due to flattening of tree.h. * tree-vect-loop.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h and inchash.h due to flattening of tree.h. * tree-vect-loop-manip.c: ditto. * tree-vectorizer.c: ditto. * tree-vect-patterns.c: ditto. * tree-vect-slp.c: ditto. * tree-vect-stmts.c: ditto. * tree-vrp.c: ditto. * tsan.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h and inchash.h due to flattening of tree.h. * ubsan.c: ditto. * value-prof.c.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h and inchash.h due to flattening of tree.h. * varasm.c: ditto. * varpool.c: ditto. * var-tracking.c: ditto. * vmsdbgout.c: ditto. * vtable-verify.c: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h and inchash.h due to flattening of tree.h. * wide-int.cc: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, fold-const.h, wide-int.h and inchash.h due to flattening of tree.h. * xcoffout.c: ditto. * libcc1/plugin.cc: Include hash-set.h, machmode.h, vec.h, double-int.h, input.h, alias.h, symtab.h, options.h, fold-const.h, wide-int.h and inchash.h due to flattening of tree.h. From-SVN: r219402
621 lines
16 KiB
C
621 lines
16 KiB
C
/* Handle exceptions for GNU compiler for the Java(TM) language.
|
|
Copyright (C) 1997-2015 Free Software Foundation, Inc.
|
|
|
|
This file is part of GCC.
|
|
|
|
GCC is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3, or (at your option)
|
|
any later version.
|
|
|
|
GCC is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GCC; see the file COPYING3. If not see
|
|
<http://www.gnu.org/licenses/>.
|
|
|
|
Java and all Java-based marks are trademarks or registered trademarks
|
|
of Sun Microsystems, Inc. in the United States and other countries.
|
|
The Free Software Foundation is independent of Sun Microsystems, Inc. */
|
|
|
|
#include "config.h"
|
|
#include "system.h"
|
|
#include "coretypes.h"
|
|
#include "tm.h"
|
|
#include "hash-set.h"
|
|
#include "machmode.h"
|
|
#include "vec.h"
|
|
#include "double-int.h"
|
|
#include "input.h"
|
|
#include "alias.h"
|
|
#include "symtab.h"
|
|
#include "wide-int.h"
|
|
#include "inchash.h"
|
|
#include "tree.h"
|
|
#include "fold-const.h"
|
|
#include "stringpool.h"
|
|
#include "stor-layout.h"
|
|
#include "java-tree.h"
|
|
#include "javaop.h"
|
|
#include "java-opcodes.h"
|
|
#include "jcf.h"
|
|
#include "java-except.h"
|
|
#include "diagnostic-core.h"
|
|
#include "toplev.h"
|
|
#include "tree-iterator.h"
|
|
|
|
|
|
static void expand_start_java_handler (struct eh_range *);
|
|
static struct eh_range *find_handler_in_range (int, struct eh_range *,
|
|
struct eh_range *);
|
|
static void check_start_handlers (struct eh_range *, int);
|
|
static void free_eh_ranges (struct eh_range *range);
|
|
|
|
struct eh_range *current_method_handlers;
|
|
|
|
struct eh_range *current_try_block = NULL;
|
|
|
|
/* These variables are used to speed up find_handler. */
|
|
|
|
static int cache_range_start, cache_range_end;
|
|
static struct eh_range *cache_range;
|
|
static struct eh_range *cache_next_child;
|
|
|
|
/* A dummy range that represents the entire method. */
|
|
|
|
struct eh_range whole_range;
|
|
|
|
/* Check the invariants of the structure we're using to contain
|
|
exception regions. Either returns true or fails an assertion
|
|
check. */
|
|
|
|
bool
|
|
sanity_check_exception_range (struct eh_range *range)
|
|
{
|
|
struct eh_range *ptr = range->first_child;
|
|
for (; ptr; ptr = ptr->next_sibling)
|
|
{
|
|
gcc_assert (ptr->outer == range
|
|
&& ptr->end_pc > ptr->start_pc);
|
|
if (ptr->next_sibling)
|
|
gcc_assert (ptr->next_sibling->start_pc >= ptr->end_pc);
|
|
gcc_assert (ptr->start_pc >= ptr->outer->start_pc
|
|
&& ptr->end_pc <= ptr->outer->end_pc);
|
|
(void) sanity_check_exception_range (ptr);
|
|
}
|
|
return true;
|
|
}
|
|
|
|
#if defined(DEBUG_JAVA_BINDING_LEVELS)
|
|
extern int is_class_level;
|
|
extern int current_pc;
|
|
extern int binding_depth;
|
|
extern void indent (void);
|
|
static void
|
|
print_ranges (struct eh_range *range)
|
|
{
|
|
if (! range)
|
|
return;
|
|
|
|
struct eh_range *child = range->first_child;
|
|
|
|
indent ();
|
|
fprintf (stderr, "handler pc %d --> %d ", range->start_pc, range->end_pc);
|
|
|
|
tree handler = range->handlers;
|
|
for ( ; handler != NULL_TREE; handler = TREE_CHAIN (handler))
|
|
{
|
|
tree type = TREE_PURPOSE (handler);
|
|
if (type == NULL)
|
|
type = throwable_type_node;
|
|
fprintf (stderr, " type=%s ", IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (type))));
|
|
}
|
|
fprintf (stderr, "\n");
|
|
|
|
int saved = binding_depth;
|
|
binding_depth++;
|
|
print_ranges (child);
|
|
binding_depth = saved;
|
|
|
|
print_ranges (range->next_sibling);
|
|
}
|
|
#endif
|
|
|
|
/* Search for the most specific eh_range containing PC.
|
|
Assume PC is within RANGE.
|
|
CHILD is a list of children of RANGE such that any
|
|
previous children have end_pc values that are too low. */
|
|
|
|
static struct eh_range *
|
|
find_handler_in_range (int pc, struct eh_range *range, struct eh_range *child)
|
|
{
|
|
for (; child != NULL; child = child->next_sibling)
|
|
{
|
|
if (pc < child->start_pc)
|
|
break;
|
|
if (pc < child->end_pc)
|
|
return find_handler_in_range (pc, child, child->first_child);
|
|
}
|
|
cache_range = range;
|
|
cache_range_start = pc;
|
|
cache_next_child = child;
|
|
cache_range_end = child == NULL ? range->end_pc : child->start_pc;
|
|
return range;
|
|
}
|
|
|
|
/* Find the inner-most handler that contains PC. */
|
|
|
|
struct eh_range *
|
|
find_handler (int pc)
|
|
{
|
|
struct eh_range *h;
|
|
if (pc >= cache_range_start)
|
|
{
|
|
h = cache_range;
|
|
if (pc < cache_range_end)
|
|
return h;
|
|
while (pc >= h->end_pc)
|
|
{
|
|
cache_next_child = h->next_sibling;
|
|
h = h->outer;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
h = &whole_range;
|
|
cache_next_child = h->first_child;
|
|
}
|
|
return find_handler_in_range (pc, h, cache_next_child);
|
|
}
|
|
|
|
static void
|
|
free_eh_ranges (struct eh_range *range)
|
|
{
|
|
while (range)
|
|
{
|
|
struct eh_range *next = range->next_sibling;
|
|
free_eh_ranges (range->first_child);
|
|
if (range != &whole_range)
|
|
free (range);
|
|
range = next;
|
|
}
|
|
}
|
|
|
|
/* Called to re-initialize the exception machinery for a new method. */
|
|
|
|
void
|
|
method_init_exceptions (void)
|
|
{
|
|
free_eh_ranges (&whole_range);
|
|
whole_range.start_pc = 0;
|
|
whole_range.end_pc = DECL_CODE_LENGTH (current_function_decl) + 1;
|
|
whole_range.outer = NULL;
|
|
whole_range.first_child = NULL;
|
|
whole_range.next_sibling = NULL;
|
|
cache_range_start = 0xFFFFFF;
|
|
}
|
|
|
|
/* Split an exception range into two at PC. The sub-ranges that
|
|
belong to the range are split and distributed between the two new
|
|
ranges. */
|
|
|
|
static void
|
|
split_range (struct eh_range *range, int pc)
|
|
{
|
|
struct eh_range *ptr;
|
|
struct eh_range **first_child, **second_child;
|
|
struct eh_range *h;
|
|
|
|
/* First, split all the sub-ranges. */
|
|
for (ptr = range->first_child; ptr; ptr = ptr->next_sibling)
|
|
{
|
|
if (pc > ptr->start_pc
|
|
&& pc < ptr->end_pc)
|
|
{
|
|
split_range (ptr, pc);
|
|
}
|
|
}
|
|
|
|
/* Create a new range. */
|
|
h = XNEW (struct eh_range);
|
|
|
|
h->start_pc = pc;
|
|
h->end_pc = range->end_pc;
|
|
h->next_sibling = range->next_sibling;
|
|
range->next_sibling = h;
|
|
range->end_pc = pc;
|
|
h->handlers = build_tree_list (TREE_PURPOSE (range->handlers),
|
|
TREE_VALUE (range->handlers));
|
|
h->next_sibling = NULL;
|
|
h->expanded = 0;
|
|
h->stmt = NULL;
|
|
h->outer = range->outer;
|
|
h->first_child = NULL;
|
|
|
|
ptr = range->first_child;
|
|
first_child = &range->first_child;
|
|
second_child = &h->first_child;
|
|
|
|
/* Distribute the sub-ranges between the two new ranges. */
|
|
for (ptr = range->first_child; ptr; ptr = ptr->next_sibling)
|
|
{
|
|
if (ptr->start_pc < pc)
|
|
{
|
|
*first_child = ptr;
|
|
ptr->outer = range;
|
|
first_child = &ptr->next_sibling;
|
|
}
|
|
else
|
|
{
|
|
*second_child = ptr;
|
|
ptr->outer = h;
|
|
second_child = &ptr->next_sibling;
|
|
}
|
|
}
|
|
*first_child = NULL;
|
|
*second_child = NULL;
|
|
}
|
|
|
|
|
|
/* Add an exception range.
|
|
|
|
There are some missed optimization opportunities here. For
|
|
example, some bytecode obfuscators generate seemingly
|
|
nonoverlapping exception ranges which, when coalesced, do in fact
|
|
nest correctly. We could merge these, but we'd have to fix up all
|
|
the enclosed regions first and perhaps create a new range anyway if
|
|
it overlapped existing ranges.
|
|
|
|
Also, we don't attempt to detect the case where two previously
|
|
added disjoint ranges could be coalesced by a new range. */
|
|
|
|
void
|
|
add_handler (int start_pc, int end_pc, tree handler, tree type)
|
|
{
|
|
struct eh_range *ptr, *h;
|
|
struct eh_range **first_child, **prev;
|
|
|
|
/* First, split all the existing ranges that we need to enclose. */
|
|
for (ptr = whole_range.first_child; ptr; ptr = ptr->next_sibling)
|
|
{
|
|
if (start_pc > ptr->start_pc
|
|
&& start_pc < ptr->end_pc)
|
|
{
|
|
split_range (ptr, start_pc);
|
|
}
|
|
|
|
if (end_pc > ptr->start_pc
|
|
&& end_pc < ptr->end_pc)
|
|
{
|
|
split_range (ptr, end_pc);
|
|
}
|
|
|
|
if (ptr->start_pc >= end_pc)
|
|
break;
|
|
}
|
|
|
|
/* Create the new range. */
|
|
h = XNEW (struct eh_range);
|
|
first_child = &h->first_child;
|
|
|
|
h->start_pc = start_pc;
|
|
h->end_pc = end_pc;
|
|
h->first_child = NULL;
|
|
h->outer = NULL_EH_RANGE;
|
|
h->handlers = build_tree_list (type, handler);
|
|
h->next_sibling = NULL;
|
|
h->expanded = 0;
|
|
h->stmt = NULL;
|
|
|
|
/* Find every range at the top level that will be a sub-range of the
|
|
range we're inserting and make it so. */
|
|
{
|
|
struct eh_range **prev = &whole_range.first_child;
|
|
for (ptr = *prev; ptr;)
|
|
{
|
|
struct eh_range *next = ptr->next_sibling;
|
|
|
|
if (ptr->start_pc >= end_pc)
|
|
break;
|
|
|
|
if (ptr->start_pc < start_pc)
|
|
{
|
|
prev = &ptr->next_sibling;
|
|
}
|
|
else if (ptr->start_pc >= start_pc
|
|
&& ptr->start_pc < end_pc)
|
|
{
|
|
*prev = next;
|
|
*first_child = ptr;
|
|
first_child = &ptr->next_sibling;
|
|
ptr->outer = h;
|
|
ptr->next_sibling = NULL;
|
|
}
|
|
|
|
ptr = next;
|
|
}
|
|
}
|
|
|
|
/* Find the right place to insert the new range. */
|
|
prev = &whole_range.first_child;
|
|
for (ptr = *prev; ptr; prev = &ptr->next_sibling, ptr = ptr->next_sibling)
|
|
{
|
|
gcc_assert (ptr->outer == NULL_EH_RANGE);
|
|
if (ptr->start_pc >= start_pc)
|
|
break;
|
|
}
|
|
|
|
/* And insert it there. */
|
|
*prev = h;
|
|
if (ptr)
|
|
{
|
|
h->next_sibling = ptr;
|
|
h->outer = ptr->outer;
|
|
}
|
|
}
|
|
|
|
|
|
/* if there are any handlers for this range, issue start of region */
|
|
static void
|
|
expand_start_java_handler (struct eh_range *range)
|
|
{
|
|
#if defined(DEBUG_JAVA_BINDING_LEVELS)
|
|
indent ();
|
|
fprintf (stderr, "expand start handler pc %d --> %d\n",
|
|
current_pc, range->end_pc);
|
|
#endif /* defined(DEBUG_JAVA_BINDING_LEVELS) */
|
|
pushlevel (0);
|
|
register_exception_range (range, range->start_pc, range->end_pc);
|
|
range->expanded = 1;
|
|
}
|
|
|
|
tree
|
|
prepare_eh_table_type (tree type)
|
|
{
|
|
tree exp;
|
|
tree *slot;
|
|
const char *name;
|
|
char *buf;
|
|
tree decl;
|
|
tree utf8_ref;
|
|
|
|
/* The "type" (match_info) in a (Java) exception table is a pointer to:
|
|
* a) NULL - meaning match any type in a try-finally.
|
|
* b) a pointer to a pointer to a class.
|
|
* c) a pointer to a pointer to a utf8_ref. The pointer is
|
|
* rewritten to point to the appropriate class. */
|
|
|
|
if (type == NULL_TREE)
|
|
return NULL_TREE;
|
|
|
|
if (TYPE_TO_RUNTIME_MAP (output_class) == NULL)
|
|
TYPE_TO_RUNTIME_MAP (output_class) = java_treetreehash_create (10);
|
|
|
|
slot = java_treetreehash_new (TYPE_TO_RUNTIME_MAP (output_class), type);
|
|
if (*slot != NULL)
|
|
return TREE_VALUE (*slot);
|
|
|
|
if (is_compiled_class (type) && !flag_indirect_dispatch)
|
|
{
|
|
name = IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (type)));
|
|
buf = (char *) alloca (strlen (name) + 5);
|
|
sprintf (buf, "%s_ref", name);
|
|
decl = build_decl (input_location,
|
|
VAR_DECL, get_identifier (buf), ptr_type_node);
|
|
TREE_STATIC (decl) = 1;
|
|
DECL_ARTIFICIAL (decl) = 1;
|
|
DECL_IGNORED_P (decl) = 1;
|
|
TREE_READONLY (decl) = 1;
|
|
TREE_THIS_VOLATILE (decl) = 0;
|
|
DECL_INITIAL (decl) = build_class_ref (type);
|
|
layout_decl (decl, 0);
|
|
pushdecl (decl);
|
|
exp = build1 (ADDR_EXPR, build_pointer_type (TREE_TYPE (decl)), decl);
|
|
}
|
|
else
|
|
{
|
|
utf8_ref = build_utf8_ref (DECL_NAME (TYPE_NAME (type)));
|
|
name = IDENTIFIER_POINTER (DECL_NAME (TREE_OPERAND (utf8_ref, 0)));
|
|
buf = (char *) alloca (strlen (name) + 5);
|
|
sprintf (buf, "%s_ref", name);
|
|
decl = build_decl (input_location,
|
|
VAR_DECL, get_identifier (buf), utf8const_ptr_type);
|
|
TREE_STATIC (decl) = 1;
|
|
DECL_ARTIFICIAL (decl) = 1;
|
|
DECL_IGNORED_P (decl) = 1;
|
|
TREE_READONLY (decl) = 1;
|
|
TREE_THIS_VOLATILE (decl) = 0;
|
|
layout_decl (decl, 0);
|
|
pushdecl (decl);
|
|
exp = build1 (ADDR_EXPR, build_pointer_type (utf8const_ptr_type), decl);
|
|
CONSTRUCTOR_APPEND_ELT (TYPE_CATCH_CLASSES (output_class),
|
|
NULL_TREE,
|
|
make_catch_class_record (exp, utf8_ref));
|
|
}
|
|
|
|
exp = convert (ptr_type_node, exp);
|
|
|
|
*slot = tree_cons (type, exp, NULL_TREE);
|
|
|
|
return exp;
|
|
}
|
|
|
|
int
|
|
expand_catch_class (treetreehash_entry **entry, int)
|
|
{
|
|
struct treetreehash_entry *ite = *entry;
|
|
tree addr = TREE_VALUE ((tree)ite->value);
|
|
tree decl;
|
|
STRIP_NOPS (addr);
|
|
decl = TREE_OPERAND (addr, 0);
|
|
rest_of_decl_compilation (decl, global_bindings_p (), 0);
|
|
return true;
|
|
}
|
|
|
|
/* For every class in the TYPE_TO_RUNTIME_MAP, expand the
|
|
corresponding object that is used by the runtime type matcher. */
|
|
|
|
void
|
|
java_expand_catch_classes (tree this_class)
|
|
{
|
|
if (TYPE_TO_RUNTIME_MAP (this_class))
|
|
TYPE_TO_RUNTIME_MAP (this_class)->traverse<int, expand_catch_class> (0);
|
|
}
|
|
|
|
/* Build and push the variable that will hold the exception object
|
|
within this function. */
|
|
|
|
static tree
|
|
build_exception_object_var (void)
|
|
{
|
|
tree decl = DECL_FUNCTION_EXC_OBJ (current_function_decl);
|
|
if (decl == NULL)
|
|
{
|
|
decl = build_decl (DECL_SOURCE_LOCATION (current_function_decl),
|
|
VAR_DECL, get_identifier ("#exc_obj"), ptr_type_node);
|
|
DECL_IGNORED_P (decl) = 1;
|
|
DECL_ARTIFICIAL (decl) = 1;
|
|
|
|
DECL_FUNCTION_EXC_OBJ (current_function_decl) = decl;
|
|
pushdecl_function_level (decl);
|
|
}
|
|
return decl;
|
|
}
|
|
|
|
/* Build a reference to the jthrowable object being carried in the
|
|
exception header. */
|
|
|
|
tree
|
|
build_exception_object_ref (tree type)
|
|
{
|
|
tree obj;
|
|
|
|
/* Java only passes object via pointer and doesn't require adjusting.
|
|
The java object is immediately before the generic exception header. */
|
|
obj = build_exception_object_var ();
|
|
obj = fold_convert (build_pointer_type (type), obj);
|
|
obj = fold_build_pointer_plus (obj,
|
|
fold_build1 (NEGATE_EXPR, sizetype,
|
|
TYPE_SIZE_UNIT (TREE_TYPE (obj))));
|
|
obj = build1 (INDIRECT_REF, type, obj);
|
|
|
|
return obj;
|
|
}
|
|
|
|
/* If there are any handlers for this range, issue end of range,
|
|
and then all handler blocks */
|
|
void
|
|
expand_end_java_handler (struct eh_range *range)
|
|
{
|
|
tree handler = range->handlers;
|
|
if (handler)
|
|
{
|
|
tree exc_obj = build_exception_object_var ();
|
|
tree catches = make_node (STATEMENT_LIST);
|
|
tree_stmt_iterator catches_i = tsi_last (catches);
|
|
tree *body;
|
|
|
|
for (; handler; handler = TREE_CHAIN (handler))
|
|
{
|
|
tree type, eh_type, x;
|
|
tree stmts = make_node (STATEMENT_LIST);
|
|
tree_stmt_iterator stmts_i = tsi_last (stmts);
|
|
|
|
type = TREE_PURPOSE (handler);
|
|
if (type == NULL)
|
|
type = throwable_type_node;
|
|
eh_type = prepare_eh_table_type (type);
|
|
|
|
x = build_call_expr (builtin_decl_explicit (BUILT_IN_EH_POINTER),
|
|
1, integer_zero_node);
|
|
x = build2 (MODIFY_EXPR, void_type_node, exc_obj, x);
|
|
tsi_link_after (&stmts_i, x, TSI_CONTINUE_LINKING);
|
|
|
|
x = build1 (GOTO_EXPR, void_type_node, TREE_VALUE (handler));
|
|
tsi_link_after (&stmts_i, x, TSI_CONTINUE_LINKING);
|
|
|
|
x = build2 (CATCH_EXPR, void_type_node, eh_type, stmts);
|
|
tsi_link_after (&catches_i, x, TSI_CONTINUE_LINKING);
|
|
|
|
/* Throwable can match anything in Java, and therefore
|
|
any subsequent handlers are unreachable. */
|
|
/* ??? If we're assured of no foreign language exceptions,
|
|
we'd be better off using NULL as the exception type
|
|
for the catch. */
|
|
if (type == throwable_type_node)
|
|
break;
|
|
}
|
|
|
|
body = get_stmts ();
|
|
*body = build2 (TRY_CATCH_EXPR, void_type_node, *body, catches);
|
|
}
|
|
|
|
#if defined(DEBUG_JAVA_BINDING_LEVELS)
|
|
indent ();
|
|
fprintf (stderr, "expand end handler pc %d <-- %d\n",
|
|
current_pc, range->start_pc);
|
|
#endif /* defined(DEBUG_JAVA_BINDING_LEVELS) */
|
|
}
|
|
|
|
/* Recursive helper routine for maybe_start_handlers. */
|
|
|
|
static void
|
|
check_start_handlers (struct eh_range *range, int pc)
|
|
{
|
|
if (range != NULL_EH_RANGE && range->start_pc == pc)
|
|
{
|
|
check_start_handlers (range->outer, pc);
|
|
if (!range->expanded)
|
|
expand_start_java_handler (range);
|
|
}
|
|
}
|
|
|
|
|
|
/* Routine to see if exception handling is turned on.
|
|
DO_WARN is nonzero if we want to inform the user that exception
|
|
handling is turned off.
|
|
|
|
This is used to ensure that -fexceptions has been specified if the
|
|
compiler tries to use any exception-specific functions. */
|
|
|
|
static inline int
|
|
doing_eh (void)
|
|
{
|
|
if (! flag_exceptions)
|
|
{
|
|
static int warned = 0;
|
|
if (! warned)
|
|
{
|
|
error ("exception handling disabled, use -fexceptions to enable");
|
|
warned = 1;
|
|
}
|
|
return 0;
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
static struct eh_range *current_range;
|
|
|
|
/* Emit any start-of-try-range starting at start_pc and ending after
|
|
end_pc. */
|
|
|
|
void
|
|
maybe_start_try (int start_pc, int end_pc)
|
|
{
|
|
struct eh_range *range;
|
|
if (! doing_eh ())
|
|
return;
|
|
|
|
range = find_handler (start_pc);
|
|
while (range != NULL_EH_RANGE && range->start_pc == start_pc
|
|
&& range->end_pc < end_pc)
|
|
range = range->outer;
|
|
|
|
current_range = range;
|
|
check_start_handlers (range, start_pc);
|
|
}
|
|
|