mirror of
https://github.com/gcc-mirror/gcc.git
synced 2024-11-21 13:40:47 +00:00
bf43fe6aa9
My forthcoming patches for PR other/116613 make much more use of cloning of pretty_printers than before, so it makes sense as a preliminary patch for the result of pretty_printer::clone to be a std::unique_ptr, rather than add more manual uses of "delete". On doing so, I noticed various other places where naked new/delete is used for run-time configuration of diagnostics: * the output format (text vs SARIF) * client data hooks * the option manager * the URLifier Hence this patch also makes use of std::unique_ptr and ::make_unique for managing such client policy classes, and also for diagnostic_buffer's per-format implementations. Unfortunately we can't directly include <memory> in our internal headers but instead any of our TUs that make use of std::unique_ptr must #define INCLUDE_MEMORY before including system.h. Hence the bulk of this patch is taken up with adding a define of INCLUDE_MEMORY to hundreds of source files: everything that includes diagnostic.h or pretty-print.h (and thus anything transitively such as includers of lto-wrapper.h, c-tree.h, cp-tree.h and rtl-ssa.h). Thanks to Gaius Mulley for the parts of the patch that regenerated the m2 files. gcc/ada/ChangeLog: PR other/116613 * gcc-interface/misc.cc: Add #define INCLUDE_MEMORY * gcc-interface/trans.cc: Likewise. * gcc-interface/utils.cc: Likewise. gcc/analyzer/ChangeLog: PR other/116613 * analyzer-logging.cc: Add #define INCLUDE_MEMORY (logger::logger): Update for m_pp becoming a unique_ptr. (logger::~logger): Likewise. (logger::log_va_partial): Likewise. (logger::end_log_line): Likewise. * analyzer-logging.h (logger::get_printer): Likewise. (logger::m_pp): Convert to a unique_ptr. * analyzer.cc (make_label_text): Use diagnostic_context::clone_printer and use unique_ptr. (make_label_text_n): Likewise. * bar-chart.cc: Add #define INCLUDE_MEMORY * pending-diagnostic.cc (evdesc::event_desc::formatted_print): Use diagnostic_context::clone_printer and use unique_ptr. * sm-malloc.cc (sufficiently_similar_p): Likewise. * supergraph.cc (supergraph::dump_dot_to_file): Likewise. gcc/c-family/ChangeLog: PR other/116613 * c-ada-spec.cc: Add #define INCLUDE_MEMORY. * c-attribs.cc: Likewise. * c-common.cc: Likewise. * c-format.cc: Likewise. * c-gimplify.cc: Likewise. * c-indentation.cc: Likewise. * c-opts.cc: Likewise. * c-pch.cc: Likewise. * c-pragma.cc: Likewise. * c-pretty-print.cc: Likewise. Add #include "make-unique.h". (c_pretty_printer::clone): Use std::unique_ptr and ::make_unique. * c-pretty-print.h (c_pretty_printer::clone): Use std::unique_ptr. * c-type-mismatch.cc: Add #define INCLUDE_MEMORY. * c-warn.cc: Likewise. gcc/c/ChangeLog: PR other/116613 * c-aux-info.cc: Add #define INCLUDE_MEMORY. * c-convert.cc: Likewise. * c-errors.cc: Likewise. * c-fold.cc: Likewise. * c-lang.cc: Likewise. * c-objc-common.cc: Likewise. (pp_markup::element_quoted_type::print_type): Use unique_ptr. * c-typeck.cc: Add #define INCLUDE_MEMORY. * gimple-parser.cc: Likewise. gcc/cp/ChangeLog: PR other/116613 * call.cc: Add #define INCLUDE_MEMORY. * class.cc: Likewise. * constexpr.cc: Likewise. * constraint.cc: Likewise. * contracts.cc: Likewise. * coroutines.cc: Likewise. * cp-gimplify.cc: Likewise. * cp-lang.cc: Likewise. * cp-objcp-common.cc: Likewise. * cp-ubsan.cc: Likewise. * cvt.cc: Likewise. * cxx-pretty-print.cc: Likewise. Add #include "cp-tree.h". (cxx_pretty_printer::clone): Use std::unique_ptr and ::make_unique. * cxx-pretty-print.h (cxx_pretty_printer::clone): Use std::unique_ptr. * decl2.cc: Add #define INCLUDE_MEMORY. * dump.cc: Likewise. * except.cc: Likewise. * expr.cc: Likewise. * friend.cc: Likewise. * init.cc: Likewise. * lambda.cc: Likewise. * logic.cc: Likewise. * mangle.cc: Likewise. * method.cc: Likewise. * optimize.cc: Likewise. * pt.cc: Likewise. * ptree.cc: Likewise. * rtti.cc: Likewise. * search.cc: Likewise. * semantics.cc: Likewise. * tree.cc: Likewise. * typeck.cc: Likewise. * typeck2.cc: Likewise. * vtable-class-hierarchy.cc: Likewise. gcc/d/ChangeLog: PR other/116613 * d-attribs.cc: Add #define INCLUDE_MEMORY. * d-builtins.cc: Likewise. * d-codegen.cc: Likewise. * d-convert.cc: Likewise. * d-diagnostic.cc: Likewise. * d-frontend.cc: Likewise. * d-lang.cc: Likewise. * d-longdouble.cc: Likewise. * d-target.cc: Likewise. * decl.cc: Likewise. * expr.cc: Likewise. * intrinsics.cc: Likewise. * modules.cc: Likewise. * toir.cc: Likewise. * typeinfo.cc: Likewise. * types.cc: Likewise. gcc/fortran/ChangeLog: PR other/116613 * arith.cc: Add #define INCLUDE_MEMORY. * array.cc: Likewise. * bbt.cc: Likewise. * check.cc: Likewise. * class.cc: Likewise. * constructor.cc: Likewise. * convert.cc: Likewise. * cpp.cc: Likewise. * data.cc: Likewise. * decl.cc: Likewise. * dependency.cc: Likewise. * dump-parse-tree.cc: Likewise. * error.cc: Likewise. * expr.cc: Likewise. * f95-lang.cc: Likewise. * frontend-passes.cc: Likewise. * interface.cc: Likewise. * intrinsic.cc: Likewise. * io.cc: Likewise. * iresolve.cc: Likewise. * match.cc: Likewise. * matchexp.cc: Likewise. * misc.cc: Likewise. * module.cc: Likewise. * openmp.cc: Likewise. * options.cc: Likewise. * parse.cc: Likewise. * primary.cc: Likewise. * resolve.cc: Likewise. * scanner.cc: Likewise. * simplify.cc: Likewise. * st.cc: Likewise. * symbol.cc: Likewise. * target-memory.cc: Likewise. * trans-array.cc: Likewise. * trans-common.cc: Likewise. * trans-const.cc: Likewise. * trans-decl.cc: Likewise. * trans-expr.cc: Likewise. * trans-intrinsic.cc: Likewise. * trans-io.cc: Likewise. * trans-openmp.cc: Likewise. * trans-stmt.cc: Likewise. * trans-types.cc: Likewise. * trans.cc: Likewise. gcc/go/ChangeLog: PR other/116613 * go-backend.cc: Add #define INCLUDE_MEMORY. * go-lang.cc: Likewise. gcc/jit/ChangeLog: PR other/116613 * dummy-frontend.cc: Add #define INCLUDE_MEMORY. * jit-playback.cc: Likewise. * jit-recording.cc: Likewise. gcc/lto/ChangeLog: PR other/116613 * lto-common.cc: Add #define INCLUDE_MEMORY. * lto-dump.cc: Likewise. * lto-partition.cc: Likewise. * lto-symtab.cc: Likewise. * lto.cc: Likewise. gcc/m2/ChangeLog: PR other/116613 * gm2-gcc/gcc-consolidation.h: Add #define INCLUDE_MEMORY. * gm2-gcc/m2configure.cc: Likewise. * mc-boot/GASCII.cc: Regenerate. * mc-boot/GASCII.h: Ditto. * mc-boot/GArgs.cc: Ditto. * mc-boot/GArgs.h: Ditto. * mc-boot/GAssertion.cc: Ditto. * mc-boot/GAssertion.h: Ditto. * mc-boot/GBreak.cc: Ditto. * mc-boot/GBreak.h: Ditto. * mc-boot/GCOROUTINES.h: Ditto. * mc-boot/GCmdArgs.cc: Ditto. * mc-boot/GCmdArgs.h: Ditto. * mc-boot/GDebug.cc: Ditto. * mc-boot/GDebug.h: Ditto. * mc-boot/GDynamicStrings.cc: Ditto. * mc-boot/GDynamicStrings.h: Ditto. * mc-boot/GEnvironment.cc: Ditto. * mc-boot/GEnvironment.h: Ditto. * mc-boot/GFIO.cc: Ditto. * mc-boot/GFIO.h: Ditto. * mc-boot/GFormatStrings.cc: Ditto. * mc-boot/GFormatStrings.h: Ditto. * mc-boot/GFpuIO.cc: Ditto. * mc-boot/GFpuIO.h: Ditto. * mc-boot/GIO.cc: Ditto. * mc-boot/GIO.h: Ditto. * mc-boot/GIndexing.cc: Ditto. * mc-boot/GIndexing.h: Ditto. * mc-boot/GM2Dependent.cc: Ditto. * mc-boot/GM2Dependent.h: Ditto. * mc-boot/GM2EXCEPTION.cc: Ditto. * mc-boot/GM2EXCEPTION.h: Ditto. * mc-boot/GM2RTS.cc: Ditto. * mc-boot/GM2RTS.h: Ditto. * mc-boot/GMemUtils.cc: Ditto. * mc-boot/GMemUtils.h: Ditto. * mc-boot/GNumberIO.cc: Ditto. * mc-boot/GNumberIO.h: Ditto. * mc-boot/GPushBackInput.cc: Ditto. * mc-boot/GPushBackInput.h: Ditto. * mc-boot/GRTExceptions.cc: Ditto. * mc-boot/GRTExceptions.h: Ditto. * mc-boot/GRTco.h: Ditto. * mc-boot/GRTentity.h: Ditto. * mc-boot/GRTint.cc: Ditto. * mc-boot/GRTint.h: Ditto. * mc-boot/GSArgs.cc: Ditto. * mc-boot/GSArgs.h: Ditto. * mc-boot/GSFIO.cc: Ditto. * mc-boot/GSFIO.h: Ditto. * mc-boot/GSYSTEM.h: Ditto. * mc-boot/GSelective.h: Ditto. * mc-boot/GStdIO.cc: Ditto. * mc-boot/GStdIO.h: Ditto. * mc-boot/GStorage.cc: Ditto. * mc-boot/GStorage.h: Ditto. * mc-boot/GStrCase.cc: Ditto. * mc-boot/GStrCase.h: Ditto. * mc-boot/GStrIO.cc: Ditto. * mc-boot/GStrIO.h: Ditto. * mc-boot/GStrLib.cc: Ditto. * mc-boot/GStrLib.h: Ditto. * mc-boot/GStringConvert.cc: Ditto. * mc-boot/GStringConvert.h: Ditto. * mc-boot/GSysExceptions.h: Ditto. * mc-boot/GSysStorage.cc: Ditto. * mc-boot/GSysStorage.h: Ditto. * mc-boot/GTimeString.cc: Ditto. * mc-boot/GTimeString.h: Ditto. * mc-boot/GUnixArgs.h: Ditto. * mc-boot/Galists.cc: Ditto. * mc-boot/Galists.h: Ditto. * mc-boot/Gdecl.cc: Ditto. * mc-boot/Gdecl.h: Ditto. * mc-boot/Gdtoa.h: Ditto. * mc-boot/Gerrno.h: Ditto. * mc-boot/Gkeyc.cc: Ditto. * mc-boot/Gkeyc.h: Ditto. * mc-boot/Gldtoa.h: Ditto. * mc-boot/Glibc.h: Ditto. * mc-boot/Glibm.h: Ditto. * mc-boot/Glists.cc: Ditto. * mc-boot/Glists.h: Ditto. * mc-boot/GmcComment.cc: Ditto. * mc-boot/GmcComment.h: Ditto. * mc-boot/GmcComp.cc: Ditto. * mc-boot/GmcComp.h: Ditto. * mc-boot/GmcDebug.cc: Ditto. * mc-boot/GmcDebug.h: Ditto. * mc-boot/GmcError.cc: Ditto. * mc-boot/GmcError.h: Ditto. * mc-boot/GmcFileName.cc: Ditto. * mc-boot/GmcFileName.h: Ditto. * mc-boot/GmcLexBuf.cc: Ditto. * mc-boot/GmcLexBuf.h: Ditto. * mc-boot/GmcMetaError.cc: Ditto. * mc-boot/GmcMetaError.h: Ditto. * mc-boot/GmcOptions.cc: Ditto. * mc-boot/GmcOptions.h: Ditto. * mc-boot/GmcPreprocess.cc: Ditto. * mc-boot/GmcPreprocess.h: Ditto. * mc-boot/GmcPretty.cc: Ditto. * mc-boot/GmcPretty.h: Ditto. * mc-boot/GmcPrintf.cc: Ditto. * mc-boot/GmcPrintf.h: Ditto. * mc-boot/GmcQuiet.cc: Ditto. * mc-boot/GmcQuiet.h: Ditto. * mc-boot/GmcReserved.cc: Ditto. * mc-boot/GmcReserved.h: Ditto. * mc-boot/GmcSearch.cc: Ditto. * mc-boot/GmcSearch.h: Ditto. * mc-boot/GmcStack.cc: Ditto. * mc-boot/GmcStack.h: Ditto. * mc-boot/GmcStream.cc: Ditto. * mc-boot/GmcStream.h: Ditto. * mc-boot/Gmcflex.h: Ditto. * mc-boot/Gmcp1.cc: Ditto. * mc-boot/Gmcp1.h: Ditto. * mc-boot/Gmcp2.cc: Ditto. * mc-boot/Gmcp2.h: Ditto. * mc-boot/Gmcp3.cc: Ditto. * mc-boot/Gmcp3.h: Ditto. * mc-boot/Gmcp4.cc: Ditto. * mc-boot/Gmcp4.h: Ditto. * mc-boot/Gmcp5.cc: Ditto. * mc-boot/Gmcp5.h: Ditto. * mc-boot/GnameKey.cc: Ditto. * mc-boot/GnameKey.h: Ditto. * mc-boot/GsymbolKey.cc: Ditto. * mc-boot/GsymbolKey.h: Ditto. * mc-boot/Gtermios.h: Ditto. * mc-boot/Gtop.cc: Ditto. * mc-boot/Gvarargs.cc: Ditto. * mc-boot/Gvarargs.h: Ditto. * mc-boot/Gwlists.cc: Ditto. * mc-boot/Gwlists.h: Ditto. * mc-boot/Gwrapc.h: Ditto. * mc/keyc.mod (checkGccConfigSystem): Add #define INCLUDE_MEMORY. * pge-boot/GASCII.cc: Regenerate. * pge-boot/GASCII.h: Ditto. * pge-boot/GArgs.cc: Ditto. * pge-boot/GArgs.h: Ditto. * pge-boot/GAssertion.cc: Ditto. * pge-boot/GAssertion.h: Ditto. * pge-boot/GBreak.h: Ditto. * pge-boot/GCmdArgs.h: Ditto. * pge-boot/GDebug.cc: Ditto. * pge-boot/GDebug.h: Ditto. * pge-boot/GDynamicStrings.cc: Ditto. * pge-boot/GDynamicStrings.h: Ditto. * pge-boot/GEnvironment.h: Ditto. * pge-boot/GFIO.cc: Ditto. * pge-boot/GFIO.h: Ditto. * pge-boot/GFormatStrings.h: Ditto. * pge-boot/GFpuIO.h: Ditto. * pge-boot/GIO.cc: Ditto. * pge-boot/GIO.h: Ditto. * pge-boot/GIndexing.cc: Ditto. * pge-boot/GIndexing.h: Ditto. * pge-boot/GLists.cc: Ditto. * pge-boot/GLists.h: Ditto. * pge-boot/GM2Dependent.cc: Ditto. * pge-boot/GM2Dependent.h: Ditto. * pge-boot/GM2EXCEPTION.cc: Ditto. * pge-boot/GM2EXCEPTION.h: Ditto. * pge-boot/GM2RTS.cc: Ditto. * pge-boot/GM2RTS.h: Ditto. * pge-boot/GNameKey.cc: Ditto. * pge-boot/GNameKey.h: Ditto. * pge-boot/GNumberIO.cc: Ditto. * pge-boot/GNumberIO.h: Ditto. * pge-boot/GOutput.cc: Ditto. * pge-boot/GOutput.h: Ditto. * pge-boot/GPushBackInput.cc: Ditto. * pge-boot/GPushBackInput.h: Ditto. * pge-boot/GRTExceptions.cc: Ditto. * pge-boot/GRTExceptions.h: Ditto. * pge-boot/GSArgs.h: Ditto. * pge-boot/GSEnvironment.h: Ditto. * pge-boot/GSFIO.cc: Ditto. * pge-boot/GSFIO.h: Ditto. * pge-boot/GSYSTEM.h: Ditto. * pge-boot/GScan.h: Ditto. * pge-boot/GStdIO.cc: Ditto. * pge-boot/GStdIO.h: Ditto. * pge-boot/GStorage.cc: Ditto. * pge-boot/GStorage.h: Ditto. * pge-boot/GStrCase.cc: Ditto. * pge-boot/GStrCase.h: Ditto. * pge-boot/GStrIO.cc: Ditto. * pge-boot/GStrIO.h: Ditto. * pge-boot/GStrLib.cc: Ditto. * pge-boot/GStrLib.h: Ditto. * pge-boot/GStringConvert.h: Ditto. * pge-boot/GSymbolKey.cc: Ditto. * pge-boot/GSymbolKey.h: Ditto. * pge-boot/GSysExceptions.h: Ditto. * pge-boot/GSysStorage.cc: Ditto. * pge-boot/GSysStorage.h: Ditto. * pge-boot/GTimeString.h: Ditto. * pge-boot/GUnixArgs.h: Ditto. * pge-boot/Gbnflex.cc: Ditto. * pge-boot/Gbnflex.h: Ditto. * pge-boot/Gdtoa.h: Ditto. * pge-boot/Gerrno.h: Ditto. * pge-boot/Gldtoa.h: Ditto. * pge-boot/Glibc.h: Ditto. * pge-boot/Glibm.h: Ditto. * pge-boot/Gpge.cc: Ditto. * pge-boot/Gtermios.h: Ditto. * pge-boot/Gwrapc.h: Ditto. gcc/objc/ChangeLog: PR other/116613 * objc-act.cc: Add #define INCLUDE_MEMORY. * objc-encoding.cc: Likewise. * objc-gnu-runtime-abi-01.cc: Likewise. * objc-lang.cc: Likewise. * objc-next-runtime-abi-01.cc: Likewise. * objc-next-runtime-abi-02.cc: Likewise. * objc-runtime-shared-support.cc: Likewise. gcc/objcp/ChangeLog:: Add #define INCLUDE_MEMORY. PR other/116613 * objcp-decl.cc * objcp-lang.cc: Likewise. gcc/rust/ChangeLog: PR other/116613 * resolve/rust-ast-resolve-expr.cc: Add #define INCLUDE_MEMORY. * rust-attribs.cc: Likewise. * rust-system.h: Likewise. gcc/ChangeLog: PR other/116613 * asan.cc: Add #define INCLUDE_MEMORY. * attribs.cc: Likewise. (attr_access::array_as_string): Use diagnostic_context::clone_printer and use unique_ptr. * auto-profile.cc: Add #define INCLUDE_MEMORY. * calls.cc: Likewise. * cfganal.cc: Likewise. * cfgexpand.cc: Likewise. * cfghooks.cc: Likewise. * cfgloop.cc: Likewise. * cgraph.cc: Likewise. * cgraphclones.cc: Likewise. * cgraphunit.cc: Likewise. * collect-utils.cc: Likewise. * collect2.cc: Likewise. * common/config/aarch64/aarch64-common.cc: Likewise. * common/config/arm/arm-common.cc: Likewise. * common/config/avr/avr-common.cc: Likewise. * config/aarch64/aarch64-cc-fusion.cc: Likewise. * config/aarch64/aarch64-early-ra.cc: Likewise. * config/aarch64/aarch64-sve-builtins.cc: Likewise. * config/arc/arc.cc: Likewise. * config/arm/aarch-common.cc: Likewise. * config/arm/arm-mve-builtins.cc: Likewise. * config/avr/avr-devices.cc: Likewise. * config/avr/driver-avr.cc: Likewise. * config/bpf/bpf.cc: Likewise. * config/bpf/btfext-out.cc: Likewise. * config/bpf/core-builtins.cc: Likewise. * config/darwin.cc: Likewise. * config/i386/driver-i386.cc: Likewise. * config/i386/i386-builtins.cc: Likewise. * config/i386/i386-expand.cc: Likewise. * config/i386/i386-features.cc: Likewise. * config/i386/i386-options.cc: Likewise. * config/loongarch/loongarch-builtins.cc: Likewise. * config/mingw/winnt-cxx.cc: Likewise. * config/mingw/winnt.cc: Likewise. * config/mips/mips.cc: Likewise. * config/msp430/driver-msp430.cc: Likewise. * config/nvptx/mkoffload.cc: Likewise. * config/nvptx/nvptx.cc: Likewise. * config/riscv/riscv-avlprop.cc: Likewise. * config/riscv/riscv-vector-builtins.cc: Likewise. * config/riscv/riscv-vsetvl.cc: Likewise. * config/rs6000/driver-rs6000.cc: Likewise. * config/rs6000/host-darwin.cc: Likewise. * config/rs6000/rs6000-c.cc: Likewise. * config/s390/s390-c.cc: Likewise. * config/s390/s390.cc: Likewise. * config/sol2-cxx.cc: Likewise. * config/vms/vms-c.cc: Likewise. * config/xtensa/xtensa-dynconfig.cc: Likewise. * coroutine-passes.cc: Likewise. * coverage.cc: Likewise. * data-streamer-in.cc: Likewise. * data-streamer-out.cc: Likewise. * data-streamer.cc: Likewise. * diagnostic-buffer.h (diagnostic_buffer::~diagnostic_buffer): Delete. (diagnostic_buffer::m_per_format_buffer): Use std::unique_ptr. * diagnostic-client-data-hooks.h (make_compiler_data_hooks): Use std::unique_ptr for return type. * diagnostic-format-json.cc (json_output_format::make_per_format_buffer): Likewise. (diagnostic_output_format_init_json): Update for usage of std::unique_ptr in set_output_format. * diagnostic-format-sarif.cc (sarif_output_format::make_per_format_buffer): Use std::unique_ptr for return type. (diagnostic_output_format_init_sarif): Update for usage of std::unique_ptr. (test_message_with_embedded_link): Likewise for set_urlifier. * diagnostic-format-text.cc: Add #define INCLUDE_MEMORY. Include "make-unique.h". (diagnostic_text_output_format::set_buffer): Use std::unique_ptr. * diagnostic-format-text.h (diagnostic_text_output_format::set_buffer): Likewise. * diagnostic-format.h (diagnostic_output_format::make_per_format_buffer): Likewise. * diagnostic-global-context.cc: * diagnostic-macro-unwinding.cc: Likewise. * diagnostic-show-locus.cc: Likewise. * diagnostic-spec.cc: Likewise. * diagnostic.cc (diagnostic_context::set_output_format): Use std::unique_ptr for input. (diagnostic_context::set_client_data_hooks): Likewise. (diagnostic_context::set_option_manager): Likewise. (diagnostic_context::set_urlifier): Likewise. (diagnostic_context::set_diagnostic_buffer): Update for use of std::unique_ptr. (diagnostic_buffer::diagnostic_buffer): Likewise. (diagnostic_buffer::~diagnostic_buffer): Delete. * diagnostic.h: Complain if INCLUDE_MEMORY was not defined. (diagnostic_context::set_output_format): Use std::unique_ptr for input. (diagnostic_context::set_client_data_hooks): Likewise. (diagnostic_context::set_option_manager): Likewise. (diagnostic_context::set_urlifier): Likewise. (diagnostic_context::clone_printer): New. (diagnostic_context::m_printer): Update comment. (diagnostic_context::m_option_mgr): Likewise. (diagnostic_context::m_urlifier): Likewise. (diagnostic_context::m_edit_context_ptr): Likewise. (diagnostic_context::m_output_format): Likewise. (diagnostic_context::m_client_data_hooks): Likewise. (diagnostic_context::m_theme): Likewise. * digraph.cc: Add #define INCLUDE_MEMORY. * dwarf2out.cc: Likewise. * edit-context.cc: Likewise. * except.cc: Likewise. * expr.cc: Likewise. * file-prefix-map.cc: Likewise. * final.cc: Likewise. * fwprop.cc: Likewise. * gcc-plugin.h: Likewise. * gcc-rich-location.cc: Likewise. * gcc-urlifier.cc: Likewise. Add #include "make-unique.h". (make_gcc_urlifier): Use std::unique_ptr and ::make_unique. * gcc-urlifier.h (make_gcc_urlifier): Use std::unique_ptr. * gcc.cc: Add #define INCLUDE_MEMORY. Include "pretty-print-urlifier.h". * gcov-dump.cc: Add #define INCLUDE_MEMORY. * gcov-tool.cc: Likewise. * gengtype.cc (open_base_files): Likewise to output. * genmatch.cc: Likewise. * gimple-fold.cc: Likewise. * gimple-harden-conditionals.cc: Likewise. * gimple-harden-control-flow.cc: Likewise. * gimple-if-to-switch.cc: Likewise. * gimple-lower-bitint.cc: Likewise. * gimple-predicate-analysis.cc: Likewise. * gimple-pretty-print.cc: Likewise. * gimple-range-cache.cc: Likewise. * gimple-range-edge.cc: Likewise. * gimple-range-fold.cc: Likewise. * gimple-range-gori.cc: Likewise. * gimple-range-infer.cc: Likewise. * gimple-range-op.cc: Likewise. * gimple-range-path.cc: Likewise. * gimple-range-phi.cc: Likewise. * gimple-range-trace.cc: Likewise. * gimple-range.cc: Likewise. * gimple-ssa-backprop.cc: Likewise. * gimple-ssa-sprintf.cc: Likewise. * gimple-ssa-store-merging.cc: Likewise. * gimple-ssa-strength-reduction.cc: Likewise. * gimple-ssa-warn-access.cc: Likewise. * gimple-ssa-warn-alloca.cc: Likewise. * gimple-ssa-warn-restrict.cc: Likewise. * gimple-streamer-in.cc: Likewise. * gimple-streamer-out.cc: Likewise. * gimple.cc: Likewise. * gimplify.cc: Likewise. * graph.cc: Likewise. * graphviz.cc: Likewise. * input.cc: Likewise. * ipa-cp.cc: Likewise. * ipa-devirt.cc: Likewise. * ipa-fnsummary.cc: Likewise. * ipa-free-lang-data.cc: Likewise. * ipa-icf-gimple.cc: Likewise. * ipa-icf.cc: Likewise. * ipa-inline-analysis.cc: Likewise. * ipa-inline.cc: Likewise. * ipa-modref-tree.cc: Likewise. * ipa-modref.cc: Likewise. * ipa-param-manipulation.cc: Likewise. * ipa-polymorphic-call.cc: Likewise. * ipa-predicate.cc: Likewise. * ipa-profile.cc: Likewise. * ipa-prop.cc: Likewise. * ipa-pure-const.cc: Likewise. * ipa-reference.cc: Likewise. * ipa-split.cc: Likewise. * ipa-sra.cc: Likewise. * ipa-strub.cc: Likewise. * ipa-utils.cc: Likewise. * langhooks.cc: Likewise. * late-combine.cc: Likewise. * lto-cgraph.cc: Likewise. * lto-compress.cc: Likewise. * lto-opts.cc: Likewise. * lto-section-in.cc: Likewise. * lto-section-out.cc: Likewise. * lto-streamer-in.cc: Likewise. * lto-streamer-out.cc: Likewise. * lto-streamer.cc: Likewise. * lto-wrapper.cc: Likewise. Include "make-unique.h". (main): Use ::make_unique when creating option manager. * multiple_target.cc: Likewise. * omp-expand.cc: Likewise. * omp-general.cc: Likewise. * omp-low.cc: Likewise. * omp-oacc-neuter-broadcast.cc: Likewise. * omp-offload.cc: Likewise. * omp-simd-clone.cc: Likewise. * optc-gen.awk: Likewise in output. * optc-save-gen.awk: Likewise in output. * options-urls-cc-gen.awk: Likewise in output. * opts-common.cc: Likewise. * opts-global.cc: Likewise. * opts.cc: Likewise. * pair-fusion.cc: Likewise. * passes.cc: Likewise. * pointer-query.cc: Likewise. * predict.cc: Likewise. * pretty-print.cc (pretty_printer::clone): Use std::unique_ptr and ::make_unique. * pretty-print.h: Complain if INCLUDE_MEMORY is not defined. (pretty_printer::clone): Use std::unique_ptr. * print-rtl.cc: Add #define INCLUDE_MEMORY. * print-tree.cc: Likewise. * profile-count.cc: Likewise. * range-op-float.cc: Likewise. * range-op-ptr.cc: Likewise. * range-op.cc: Likewise. * range.cc: Likewise. * read-rtl-function.cc: Likewise. * rtl-error.cc: Likewise. * rtl-ssa/accesses.cc: Likewise. * rtl-ssa/blocks.cc: Likewise. * rtl-ssa/changes.cc: Likewise. * rtl-ssa/functions.cc: Likewise. * rtl-ssa/insns.cc: Likewise. * rtl-ssa/movement.cc: Likewise. * rtl-tests.cc: Likewise. * sanopt.cc: Likewise. * sched-rgn.cc: Likewise. * selftest-diagnostic-path.cc: Likewise. * selftest-diagnostic.cc: Likewise. * splay-tree-utils.cc: Likewise. * sreal.cc: Likewise. * stmt.cc: Likewise. * substring-locations.cc: Likewise. * symtab-clones.cc: Likewise. * symtab-thunks.cc: Likewise. * symtab.cc: Likewise. * text-art/box-drawing.cc: Likewise. * text-art/canvas.cc: Likewise. * text-art/ruler.cc: Likewise. * text-art/selftests.cc: Likewise. * text-art/theme.cc: Likewise. * toplev.cc: Likewise. Include "make-unique.h". (general_init): Use ::make_unique when setting option_manager. * trans-mem.cc: Add #define INCLUDE_MEMORY. * tree-affine.cc: Likewise. * tree-call-cdce.cc: Likewise. * tree-cfg.cc: Likewise. * tree-chrec.cc: Likewise. * tree-dfa.cc: Likewise. * tree-diagnostic-client-data-hooks.cc: Include "make-unique.h". (make_compiler_data_hooks): Use std::unique_ptr and ::make_unique. * tree-diagnostic.cc: Add #define INCLUDE_MEMORY. * tree-dump.cc: Likewise. * tree-inline.cc: Likewise. * tree-into-ssa.cc: Likewise. * tree-logical-location.cc: Likewise. * tree-nested.cc: Likewise. * tree-nrv.cc: Likewise. * tree-object-size.cc: Likewise. * tree-outof-ssa.cc: Likewise. * tree-pretty-print.cc: Likewise. * tree-profile.cc: Likewise. * tree-scalar-evolution.cc: Likewise. * tree-sra.cc: Likewise. * tree-ssa-address.cc: Likewise. * tree-ssa-alias.cc: Likewise. * tree-ssa-ccp.cc: Likewise. * tree-ssa-coalesce.cc: Likewise. * tree-ssa-copy.cc: Likewise. * tree-ssa-dce.cc: Likewise. * tree-ssa-dom.cc: Likewise. * tree-ssa-forwprop.cc: Likewise. * tree-ssa-ifcombine.cc: Likewise. * tree-ssa-loop-ch.cc: Likewise. * tree-ssa-loop-im.cc: Likewise. * tree-ssa-loop-manip.cc: Likewise. * tree-ssa-loop-niter.cc: Likewise. * tree-ssa-loop-split.cc: Likewise. * tree-ssa-math-opts.cc: Likewise. * tree-ssa-operands.cc: Likewise. * tree-ssa-phiprop.cc: Likewise. * tree-ssa-pre.cc: Likewise. * tree-ssa-propagate.cc: Likewise. * tree-ssa-reassoc.cc: Likewise. * tree-ssa-sccvn.cc: Likewise. * tree-ssa-scopedtables.cc: Likewise. * tree-ssa-sink.cc: Likewise. * tree-ssa-strlen.cc: Likewise. * tree-ssa-structalias.cc: Likewise. * tree-ssa-ter.cc: Likewise. * tree-ssa-uninit.cc: Likewise. * tree-ssa.cc: Likewise. * tree-ssanames.cc: Likewise. * tree-stdarg.cc: Likewise. * tree-streamer-in.cc: Likewise. * tree-streamer-out.cc: Likewise. * tree-streamer.cc: Likewise. * tree-switch-conversion.cc: Likewise. * tree-tailcall.cc: Likewise. * tree-vrp.cc: Likewise. * tree.cc: Likewise. * ubsan.cc: Likewise. * value-pointer-equiv.cc: Likewise. * value-prof.cc: Likewise. * value-query.cc: Likewise. * value-range-pretty-print.cc: Likewise. * value-range-storage.cc: Likewise. * value-range.cc: Likewise. * value-relation.cc: Likewise. * var-tracking.cc: Likewise. * varpool.cc: Likewise. * vr-values.cc: Likewise. * wide-int-print.cc: Likewise. gcc/testsuite/ChangeLog: PR other/116613 * gcc.dg/plugin/diagnostic_group_plugin.c: Update for use of std::unique_ptr. * gcc.dg/plugin/diagnostic_plugin_xhtml_format.c: Likewise. * gcc.dg/plugin/ggcplug.c: Likewise. libgcc/ChangeLog: PR other/116613 * libgcov-util.c: Add #define INCLUDE_MEMORY. Signed-off-by: David Malcolm <dmalcolm@redhat.com> Co-authored-by: Gaius Mulley <gaiusmod2@gmail.com> Signed-off-by: David Malcolm <dmalcolm@redhat.com>
707 lines
18 KiB
C++
707 lines
18 KiB
C++
/* IPA predicates.
|
|
Copyright (C) 2003-2024 Free Software Foundation, Inc.
|
|
Contributed by Jan Hubicka
|
|
|
|
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/>. */
|
|
|
|
#define INCLUDE_MEMORY
|
|
#include "config.h"
|
|
#include "system.h"
|
|
#include "coretypes.h"
|
|
#include "backend.h"
|
|
#include "tree.h"
|
|
#include "cgraph.h"
|
|
#include "tree-vrp.h"
|
|
#include "alloc-pool.h"
|
|
#include "symbol-summary.h"
|
|
#include "sreal.h"
|
|
#include "ipa-cp.h"
|
|
#include "ipa-prop.h"
|
|
#include "ipa-fnsummary.h"
|
|
#include "real.h"
|
|
#include "fold-const.h"
|
|
#include "tree-pretty-print.h"
|
|
#include "gimple.h"
|
|
#include "gimplify.h"
|
|
#include "data-streamer.h"
|
|
|
|
|
|
/* Check whether two set of operations have same effects. */
|
|
static bool
|
|
expr_eval_ops_equal_p (expr_eval_ops ops1, expr_eval_ops ops2)
|
|
{
|
|
if (ops1)
|
|
{
|
|
if (!ops2 || ops1->length () != ops2->length ())
|
|
return false;
|
|
|
|
for (unsigned i = 0; i < ops1->length (); i++)
|
|
{
|
|
expr_eval_op &op1 = (*ops1)[i];
|
|
expr_eval_op &op2 = (*ops2)[i];
|
|
|
|
if (op1.code != op2.code
|
|
|| op1.index != op2.index
|
|
|| !vrp_operand_equal_p (op1.val[0], op2.val[0])
|
|
|| !vrp_operand_equal_p (op1.val[1], op2.val[1])
|
|
|| !types_compatible_p (op1.type, op2.type))
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
return !ops2;
|
|
}
|
|
|
|
/* Add clause CLAUSE into the predicate P.
|
|
When CONDITIONS is NULL do not perform checking whether NEW_CLAUSE
|
|
is obviously true. This is useful only when NEW_CLAUSE is known to be
|
|
sane. */
|
|
|
|
void
|
|
ipa_predicate::add_clause (conditions conditions, clause_t new_clause)
|
|
{
|
|
int i;
|
|
int i2;
|
|
int insert_here = -1;
|
|
int c1, c2;
|
|
|
|
/* True clause. */
|
|
if (!new_clause)
|
|
return;
|
|
|
|
/* False clause makes the whole predicate false. Kill the other variants. */
|
|
if (new_clause == (1 << ipa_predicate::false_condition))
|
|
{
|
|
*this = false;
|
|
return;
|
|
}
|
|
if (*this == false)
|
|
return;
|
|
|
|
/* No one should be silly enough to add false into nontrivial clauses. */
|
|
gcc_checking_assert (!(new_clause & (1 << ipa_predicate::false_condition)));
|
|
|
|
/* Look where to insert the new_clause. At the same time prune out
|
|
new_clauses of P that are implied by the new new_clause and thus
|
|
redundant. */
|
|
for (i = 0, i2 = 0; i <= max_clauses; i++)
|
|
{
|
|
m_clause[i2] = m_clause[i];
|
|
|
|
if (!m_clause[i])
|
|
break;
|
|
|
|
/* If m_clause[i] implies new_clause, there is nothing to add. */
|
|
if ((m_clause[i] & new_clause) == m_clause[i])
|
|
{
|
|
/* We had nothing to add, none of clauses should've become
|
|
redundant. */
|
|
gcc_checking_assert (i == i2);
|
|
return;
|
|
}
|
|
|
|
if (m_clause[i] < new_clause && insert_here < 0)
|
|
insert_here = i2;
|
|
|
|
/* If new_clause implies clause[i], then clause[i] becomes redundant.
|
|
Otherwise the clause[i] has to stay. */
|
|
if ((m_clause[i] & new_clause) != new_clause)
|
|
i2++;
|
|
}
|
|
|
|
/* Look for clauses that are obviously true. I.e.
|
|
op0 == 5 || op0 != 5. */
|
|
if (conditions)
|
|
for (c1 = ipa_predicate::first_dynamic_condition;
|
|
c1 < num_conditions; c1++)
|
|
{
|
|
condition *cc1;
|
|
if (!(new_clause & (1 << c1)))
|
|
continue;
|
|
cc1 = &(*conditions)[c1 - ipa_predicate::first_dynamic_condition];
|
|
/* We have no way to represent !changed and !is_not_constant
|
|
and thus there is no point for looking for them. */
|
|
if (cc1->code == changed || cc1->code == is_not_constant || cc1->code == not_sra_candidate)
|
|
continue;
|
|
for (c2 = c1 + 1; c2 < num_conditions; c2++)
|
|
if (new_clause & (1 << c2))
|
|
{
|
|
condition *cc2 =
|
|
&(*conditions)[c2 - ipa_predicate::first_dynamic_condition];
|
|
if (cc1->operand_num == cc2->operand_num
|
|
&& vrp_operand_equal_p (cc1->val, cc2->val)
|
|
&& cc2->code != is_not_constant
|
|
&& cc2->code != not_sra_candidate
|
|
&& cc2->code != changed
|
|
&& expr_eval_ops_equal_p (cc1->param_ops, cc2->param_ops)
|
|
&& cc2->agg_contents == cc1->agg_contents
|
|
&& cc2->by_ref == cc1->by_ref
|
|
&& types_compatible_p (cc2->type, cc1->type)
|
|
&& cc1->code == invert_tree_comparison (cc2->code,
|
|
HONOR_NANS (cc1->val)))
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
/* We run out of variants. Be conservative in positive direction. */
|
|
if (i2 == max_clauses)
|
|
return;
|
|
/* Keep clauses in decreasing order. This makes equivalence testing easy. */
|
|
m_clause[i2 + 1] = 0;
|
|
if (insert_here >= 0)
|
|
for (; i2 > insert_here; i2--)
|
|
m_clause[i2] = m_clause[i2 - 1];
|
|
else
|
|
insert_here = i2;
|
|
m_clause[insert_here] = new_clause;
|
|
}
|
|
|
|
|
|
/* Do THIS &= P. */
|
|
|
|
ipa_predicate &
|
|
ipa_predicate::operator &= (const ipa_predicate &p)
|
|
{
|
|
/* Avoid busy work. */
|
|
if (p == false || *this == true)
|
|
{
|
|
*this = p;
|
|
return *this;
|
|
}
|
|
if (*this == false || p == true || this == &p)
|
|
return *this;
|
|
|
|
int i;
|
|
|
|
/* See how far ipa_predicates match. */
|
|
for (i = 0; m_clause[i] && m_clause[i] == p.m_clause[i]; i++)
|
|
{
|
|
gcc_checking_assert (i < max_clauses);
|
|
}
|
|
|
|
/* Combine the ipa_predicates rest. */
|
|
for (; p.m_clause[i]; i++)
|
|
{
|
|
gcc_checking_assert (i < max_clauses);
|
|
add_clause (NULL, p.m_clause[i]);
|
|
}
|
|
return *this;
|
|
}
|
|
|
|
|
|
|
|
/* Return THIS | P2. */
|
|
|
|
ipa_predicate
|
|
ipa_predicate::or_with (conditions conditions,
|
|
const ipa_predicate &p) const
|
|
{
|
|
/* Avoid busy work. */
|
|
if (p == false || *this == true || *this == p)
|
|
return *this;
|
|
if (*this == false || p == true)
|
|
return p;
|
|
|
|
/* OK, combine the predicates. */
|
|
ipa_predicate out = true;
|
|
|
|
for (int i = 0; m_clause[i]; i++)
|
|
for (int j = 0; p.m_clause[j]; j++)
|
|
{
|
|
gcc_checking_assert (i < max_clauses && j < max_clauses);
|
|
out.add_clause (conditions, m_clause[i] | p.m_clause[j]);
|
|
}
|
|
return out;
|
|
}
|
|
|
|
|
|
/* Having partial truth assignment in POSSIBLE_TRUTHS, return false
|
|
if predicate P is known to be false. */
|
|
|
|
bool
|
|
ipa_predicate::evaluate (clause_t possible_truths) const
|
|
{
|
|
int i;
|
|
|
|
/* True remains true. */
|
|
if (*this == true)
|
|
return true;
|
|
|
|
gcc_assert (!(possible_truths & (1 << ipa_predicate::false_condition)));
|
|
|
|
/* See if we can find clause we can disprove. */
|
|
for (i = 0; m_clause[i]; i++)
|
|
{
|
|
gcc_checking_assert (i < max_clauses);
|
|
if (!(m_clause[i] & possible_truths))
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
/* Return the probability in range 0...REG_BR_PROB_BASE that the predicated
|
|
instruction will be recomputed per invocation of the inlined call. */
|
|
|
|
int
|
|
ipa_predicate::probability (conditions conds,
|
|
clause_t possible_truths,
|
|
vec<inline_param_summary> inline_param_summary) const
|
|
{
|
|
int i;
|
|
int combined_prob = REG_BR_PROB_BASE;
|
|
|
|
/* True remains true. */
|
|
if (*this == true)
|
|
return REG_BR_PROB_BASE;
|
|
|
|
if (*this == false)
|
|
return 0;
|
|
|
|
gcc_assert (!(possible_truths & (1 << ipa_predicate::false_condition)));
|
|
|
|
/* See if we can find clause we can disprove. */
|
|
for (i = 0; m_clause[i]; i++)
|
|
{
|
|
gcc_checking_assert (i < max_clauses);
|
|
if (!(m_clause[i] & possible_truths))
|
|
return 0;
|
|
else
|
|
{
|
|
int this_prob = 0;
|
|
int i2;
|
|
if (!inline_param_summary.exists ())
|
|
return REG_BR_PROB_BASE;
|
|
for (i2 = 0; i2 < num_conditions; i2++)
|
|
if ((m_clause[i] & possible_truths) & (1 << i2))
|
|
{
|
|
if (i2 >= ipa_predicate::first_dynamic_condition)
|
|
{
|
|
condition *c =
|
|
&(*conds)[i2 - ipa_predicate::first_dynamic_condition];
|
|
if (c->code == ipa_predicate::changed
|
|
&& (c->operand_num <
|
|
(int) inline_param_summary.length ()))
|
|
{
|
|
int iprob =
|
|
inline_param_summary[c->operand_num].change_prob;
|
|
this_prob = MAX (this_prob, iprob);
|
|
}
|
|
else
|
|
this_prob = REG_BR_PROB_BASE;
|
|
}
|
|
else
|
|
this_prob = REG_BR_PROB_BASE;
|
|
}
|
|
combined_prob = MIN (this_prob, combined_prob);
|
|
if (!combined_prob)
|
|
return 0;
|
|
}
|
|
}
|
|
return combined_prob;
|
|
}
|
|
|
|
|
|
/* Dump conditional COND. */
|
|
|
|
void
|
|
dump_condition (FILE *f, conditions conditions, int cond)
|
|
{
|
|
condition *c;
|
|
if (cond == ipa_predicate::false_condition)
|
|
fprintf (f, "false");
|
|
else if (cond == ipa_predicate::not_inlined_condition)
|
|
fprintf (f, "not inlined");
|
|
else
|
|
{
|
|
c = &(*conditions)[cond - ipa_predicate::first_dynamic_condition];
|
|
fprintf (f, "op%i", c->operand_num);
|
|
if (c->agg_contents)
|
|
fprintf (f, "[%soffset: " HOST_WIDE_INT_PRINT_DEC "]",
|
|
c->by_ref ? "ref " : "", c->offset);
|
|
|
|
for (unsigned i = 0; i < vec_safe_length (c->param_ops); i++)
|
|
{
|
|
expr_eval_op &op = (*(c->param_ops))[i];
|
|
const char *op_name = op_symbol_code (op.code);
|
|
|
|
if (op_name == op_symbol_code (ERROR_MARK))
|
|
op_name = get_tree_code_name (op.code);
|
|
|
|
fprintf (f, ",(");
|
|
|
|
if (!op.val[0])
|
|
{
|
|
switch (op.code)
|
|
{
|
|
case FLOAT_EXPR:
|
|
case FIX_TRUNC_EXPR:
|
|
case FIXED_CONVERT_EXPR:
|
|
case VIEW_CONVERT_EXPR:
|
|
CASE_CONVERT:
|
|
if (op.code == VIEW_CONVERT_EXPR)
|
|
fprintf (f, "VCE");
|
|
fprintf (f, "(");
|
|
print_generic_expr (f, op.type);
|
|
fprintf (f, ")" );
|
|
break;
|
|
|
|
default:
|
|
fprintf (f, "%s", op_name);
|
|
}
|
|
fprintf (f, " #");
|
|
}
|
|
else if (!op.val[1])
|
|
{
|
|
if (op.index)
|
|
{
|
|
print_generic_expr (f, op.val[0]);
|
|
fprintf (f, " %s #", op_name);
|
|
}
|
|
else
|
|
{
|
|
fprintf (f, "# %s ", op_name);
|
|
print_generic_expr (f, op.val[0]);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
fprintf (f, "%s ", op_name);
|
|
switch (op.index)
|
|
{
|
|
case 0:
|
|
fprintf (f, "#, ");
|
|
print_generic_expr (f, op.val[0]);
|
|
fprintf (f, ", ");
|
|
print_generic_expr (f, op.val[1]);
|
|
break;
|
|
|
|
case 1:
|
|
print_generic_expr (f, op.val[0]);
|
|
fprintf (f, ", #, ");
|
|
print_generic_expr (f, op.val[1]);
|
|
break;
|
|
|
|
case 2:
|
|
print_generic_expr (f, op.val[0]);
|
|
fprintf (f, ", ");
|
|
print_generic_expr (f, op.val[1]);
|
|
fprintf (f, ", #");
|
|
break;
|
|
|
|
default:
|
|
fprintf (f, "*, *, *");
|
|
}
|
|
}
|
|
fprintf (f, ")");
|
|
}
|
|
|
|
if (c->code == ipa_predicate::is_not_constant)
|
|
{
|
|
fprintf (f, " not constant");
|
|
return;
|
|
}
|
|
if (c->code == ipa_predicate::changed)
|
|
{
|
|
fprintf (f, " changed");
|
|
return;
|
|
}
|
|
if (c->code == ipa_predicate::not_sra_candidate)
|
|
{
|
|
fprintf (f, " not sra candidate");
|
|
return;
|
|
}
|
|
fprintf (f, " %s ", op_symbol_code (c->code));
|
|
print_generic_expr (f, c->val);
|
|
}
|
|
}
|
|
|
|
|
|
/* Dump clause CLAUSE. */
|
|
|
|
static void
|
|
dump_clause (FILE *f, conditions conds, clause_t clause)
|
|
{
|
|
int i;
|
|
bool found = false;
|
|
fprintf (f, "(");
|
|
if (!clause)
|
|
fprintf (f, "true");
|
|
for (i = 0; i < ipa_predicate::num_conditions; i++)
|
|
if (clause & (1 << i))
|
|
{
|
|
if (found)
|
|
fprintf (f, " || ");
|
|
found = true;
|
|
dump_condition (f, conds, i);
|
|
}
|
|
fprintf (f, ")");
|
|
}
|
|
|
|
|
|
/* Dump THIS to F. CONDS a vector of conditions used when evaluating
|
|
ipa_predicates. When NL is true new line is output at the end of dump. */
|
|
|
|
void
|
|
ipa_predicate::dump (FILE *f, conditions conds, bool nl) const
|
|
{
|
|
int i;
|
|
if (*this == true)
|
|
dump_clause (f, conds, 0);
|
|
else
|
|
for (i = 0; m_clause[i]; i++)
|
|
{
|
|
if (i)
|
|
fprintf (f, " && ");
|
|
dump_clause (f, conds, m_clause[i]);
|
|
}
|
|
if (nl)
|
|
fprintf (f, "\n");
|
|
}
|
|
|
|
|
|
void
|
|
ipa_predicate::debug (conditions conds) const
|
|
{
|
|
dump (stderr, conds);
|
|
}
|
|
|
|
|
|
/* Remap predicate THIS of former function to be predicate of duplicated function.
|
|
POSSIBLE_TRUTHS is clause of possible truths in the duplicated node,
|
|
INFO is inline summary of the duplicated node. */
|
|
|
|
ipa_predicate
|
|
ipa_predicate::remap_after_duplication (clause_t possible_truths)
|
|
{
|
|
int j;
|
|
ipa_predicate out = true;
|
|
for (j = 0; m_clause[j]; j++)
|
|
if (!(possible_truths & m_clause[j]))
|
|
return false;
|
|
else
|
|
out.add_clause (NULL, possible_truths & m_clause[j]);
|
|
return out;
|
|
}
|
|
|
|
|
|
/* Translate all conditions from callee representation into caller
|
|
representation and symbolically evaluate predicate THIS into new predicate.
|
|
|
|
INFO is ipa_fn_summary of function we are adding predicate into, CALLEE_INFO
|
|
is summary of function predicate P is from. OPERAND_MAP is array giving
|
|
callee formal IDs the caller formal IDs. POSSSIBLE_TRUTHS is clause of all
|
|
callee conditions that may be true in caller context. TOPLEV_PREDICATE is
|
|
predicate under which callee is executed. OFFSET_MAP is an array of
|
|
offsets that need to be added to conditions, negative offset means that
|
|
conditions relying on values passed by reference have to be discarded
|
|
because they might not be preserved (and should be considered offset zero
|
|
for other purposes). */
|
|
|
|
ipa_predicate
|
|
ipa_predicate::remap_after_inlining (class ipa_fn_summary *info,
|
|
class ipa_node_params *params_summary,
|
|
class ipa_fn_summary *callee_info,
|
|
const vec<int> &operand_map,
|
|
const vec<HOST_WIDE_INT> &offset_map,
|
|
clause_t possible_truths,
|
|
const ipa_predicate &toplev_predicate)
|
|
{
|
|
int i;
|
|
ipa_predicate out = true;
|
|
|
|
/* True ipa_predicate is easy. */
|
|
if (*this == true)
|
|
return toplev_predicate;
|
|
for (i = 0; m_clause[i]; i++)
|
|
{
|
|
clause_t clause = m_clause[i];
|
|
int cond;
|
|
ipa_predicate clause_predicate = false;
|
|
|
|
gcc_assert (i < max_clauses);
|
|
|
|
for (cond = 0; cond < num_conditions; cond++)
|
|
/* Do we have condition we can't disprove? */
|
|
if (clause & possible_truths & (1 << cond))
|
|
{
|
|
ipa_predicate cond_predicate;
|
|
/* Work out if the condition can translate to predicate in the
|
|
inlined function. */
|
|
if (cond >= ipa_predicate::first_dynamic_condition)
|
|
{
|
|
struct condition *c;
|
|
|
|
int index = cond - ipa_predicate::first_dynamic_condition;
|
|
c = &(*callee_info->conds)[index];
|
|
/* See if we can remap condition operand to caller's operand.
|
|
Otherwise give up. */
|
|
if (!operand_map.exists ()
|
|
|| (int) operand_map.length () <= c->operand_num
|
|
|| operand_map[c->operand_num] == -1
|
|
/* TODO: For non-aggregate conditions, adding an offset is
|
|
basically an arithmetic jump function processing which
|
|
we should support in future. */
|
|
|| ((!c->agg_contents || !c->by_ref)
|
|
&& offset_map[c->operand_num] > 0)
|
|
|| (c->agg_contents && c->by_ref
|
|
&& offset_map[c->operand_num] < 0))
|
|
cond_predicate = true;
|
|
else
|
|
{
|
|
struct agg_position_info ap;
|
|
HOST_WIDE_INT offset_delta = offset_map[c->operand_num];
|
|
if (offset_delta < 0)
|
|
{
|
|
gcc_checking_assert (!c->agg_contents || !c->by_ref);
|
|
offset_delta = 0;
|
|
}
|
|
gcc_assert (!c->agg_contents
|
|
|| c->by_ref || offset_delta == 0);
|
|
ap.offset = c->offset + offset_delta;
|
|
ap.agg_contents = c->agg_contents;
|
|
ap.by_ref = c->by_ref;
|
|
cond_predicate = add_condition (info, params_summary,
|
|
operand_map[c->operand_num],
|
|
c->type, &ap, c->code,
|
|
c->val, c->param_ops);
|
|
}
|
|
}
|
|
/* Fixed conditions remains same, construct single
|
|
condition predicate. */
|
|
else
|
|
cond_predicate = ipa_predicate::predicate_testing_cond (cond);
|
|
clause_predicate = clause_predicate.or_with (info->conds,
|
|
cond_predicate);
|
|
}
|
|
out &= clause_predicate;
|
|
}
|
|
out &= toplev_predicate;
|
|
return out;
|
|
}
|
|
|
|
|
|
/* Read predicate from IB. */
|
|
|
|
void
|
|
ipa_predicate::stream_in (class lto_input_block *ib)
|
|
{
|
|
clause_t clause;
|
|
int k = 0;
|
|
|
|
do
|
|
{
|
|
gcc_assert (k <= max_clauses);
|
|
clause = m_clause[k++] = streamer_read_uhwi (ib);
|
|
}
|
|
while (clause);
|
|
|
|
/* Zero-initialize the remaining clauses in OUT. */
|
|
while (k <= max_clauses)
|
|
m_clause[k++] = 0;
|
|
}
|
|
|
|
|
|
/* Write predicate P to OB. */
|
|
|
|
void
|
|
ipa_predicate::stream_out (struct output_block *ob)
|
|
{
|
|
int j;
|
|
for (j = 0; m_clause[j]; j++)
|
|
{
|
|
gcc_assert (j < max_clauses);
|
|
streamer_write_uhwi (ob, m_clause[j]);
|
|
}
|
|
streamer_write_uhwi (ob, 0);
|
|
}
|
|
|
|
|
|
/* Add condition to condition list SUMMARY. OPERAND_NUM, TYPE, CODE, VAL and
|
|
PARAM_OPS correspond to fields of condition structure. AGGPOS describes
|
|
whether the used operand is loaded from an aggregate and where in the
|
|
aggregate it is. It can be NULL, which means this not a load from an
|
|
aggregate. */
|
|
|
|
ipa_predicate
|
|
add_condition (class ipa_fn_summary *summary,
|
|
class ipa_node_params *params_summary,
|
|
int operand_num,
|
|
tree type, struct agg_position_info *aggpos,
|
|
enum tree_code code, tree val, expr_eval_ops param_ops)
|
|
{
|
|
int i, j;
|
|
struct condition *c;
|
|
struct condition new_cond;
|
|
HOST_WIDE_INT offset;
|
|
bool agg_contents, by_ref;
|
|
expr_eval_op *op;
|
|
|
|
if (params_summary)
|
|
ipa_set_param_used_by_ipa_predicates (params_summary, operand_num, true);
|
|
|
|
if (aggpos)
|
|
{
|
|
offset = aggpos->offset;
|
|
agg_contents = aggpos->agg_contents;
|
|
by_ref = aggpos->by_ref;
|
|
}
|
|
else
|
|
{
|
|
offset = 0;
|
|
agg_contents = false;
|
|
by_ref = false;
|
|
}
|
|
|
|
gcc_checking_assert (operand_num >= 0);
|
|
for (i = 0; vec_safe_iterate (summary->conds, i, &c); i++)
|
|
{
|
|
if (c->operand_num == operand_num
|
|
&& c->code == code
|
|
&& types_compatible_p (c->type, type)
|
|
&& vrp_operand_equal_p (c->val, val)
|
|
&& c->agg_contents == agg_contents
|
|
&& expr_eval_ops_equal_p (c->param_ops, param_ops)
|
|
&& (!agg_contents || (c->offset == offset && c->by_ref == by_ref)))
|
|
return ipa_predicate::predicate_testing_cond (i);
|
|
}
|
|
/* Too many conditions. Give up and return constant true. */
|
|
if (i == ipa_predicate::num_conditions - ipa_predicate::first_dynamic_condition)
|
|
return true;
|
|
|
|
new_cond.operand_num = operand_num;
|
|
new_cond.code = code;
|
|
new_cond.type = unshare_expr_without_location (type);
|
|
new_cond.val = val ? unshare_expr_without_location (val) : val;
|
|
new_cond.agg_contents = agg_contents;
|
|
new_cond.by_ref = by_ref;
|
|
new_cond.offset = offset;
|
|
new_cond.param_ops = vec_safe_copy (param_ops);
|
|
|
|
for (j = 0; vec_safe_iterate (new_cond.param_ops, j, &op); j++)
|
|
{
|
|
if (op->val[0])
|
|
op->val[0] = unshare_expr_without_location (op->val[0]);
|
|
if (op->val[1])
|
|
op->val[1] = unshare_expr_without_location (op->val[1]);
|
|
}
|
|
|
|
vec_safe_push (summary->conds, new_cond);
|
|
|
|
return ipa_predicate::predicate_testing_cond (i);
|
|
}
|