https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108634

--- Comment #6 from CVS Commits <cvs-commit at gcc dot gnu.org> ---
The master branch has been updated by Jakub Jelinek <ja...@gcc.gnu.org>:

https://gcc.gnu.org/g:4c599ae6e081496466cada6f97b0d4687a6d765a

commit r13-6577-g4c599ae6e081496466cada6f97b0d4687a6d765a
Author: Jakub Jelinek <ja...@redhat.com>
Date:   Fri Mar 10 10:38:49 2023 +0100

    tree: Use comdat tree_code_{type,length} even for C++11/14 [PR108634]

    The recent change to undo the tree_code_type/tree_code_length
    excessive duplication apparently broke building the Linux kernel
    plugin.  While it is certainly desirable that GCC plugins are built
    with the same compiler as GCC has been built and with the same options
    (at least the important ones), it might be hard to arrange that,
    e.g. if gcc is built using a cross-compiler but the plugin then built
    natively, or GCC isn't bootstrapped for other reasons, or just as in
    the kernel case they were building the plugin with -std=gnu++11 while
    the bootstrapped GCC has been built without any such option and so with
    whatever the compiler defaulted to.

    For C++17 and later tree_code_{type,length} are UNIQUE symbols with
    those assembler names, while for C++11/14 they were
    _ZL14tree_code_type and _ZL16tree_code_length.

    The following patch uses a comdat var for those even for C++11/14
    as suggested by Maciej Cencora.  Relying on weak attribute is not an
    option because not all hosts support it and there are non-GNU system
    compilers.  While we could use it unconditionally,
    I think defining a template just to make it comdat is weird, and
    the compiler itself is always built with the same compiler.
    Plugins, being separate shared libraries, will have a separate copy of
    the arrays if they are ODR-used in the plugin, so there is not a big
    deal if e.g. cc1plus uses tree_code_type while plugin uses
    _ZN19tree_code_type_tmplILi0EE14tree_code_typeE or vice versa.

    2023-03-10  Jakub Jelinek  <ja...@redhat.com>

            PR plugins/108634
            * tree-core.h (tree_code_type, tree_code_length): For C++11 or
            C++14, don't declare as extern const arrays.
            (tree_code_type_tmpl, tree_code_length_tmpl): New types with
            static constexpr member arrays for C++11 or C++14.
            * tree.h (TREE_CODE_CLASS): For C++11 or C++14 use
            tree_code_type_tmpl <0>::tree_code_type instead of tree_code_type.
            (TREE_CODE_LENGTH): For C++11 or C++14 use
            tree_code_length_tmpl <0>::tree_code_length instead of
            tree_code_length.
            * tree.cc (tree_code_type, tree_code_length): Remove.
  • [Bug plugins/108634] [13 regres... cvs-commit at gcc dot gnu.org via Gcc-bugs

Reply via email to