C++ PATCH: trivial cleanup

Jason Merrill jason@redhat.com
Mon Sep 24 19:14:00 GMT 2018


OK.

On Fri, Sep 21, 2018 at 3:51 PM, Marek Polacek <polacek@redhat.com> wrote:
> Use the proper type for "complain".
>
> I guess it's obvious, but anyway, bootstrapped/regtested on x86_64-linux, ok
> for trunk?
>
> 2018-09-21  Marek Polacek  <polacek@redhat.com>
>
>         * cp-tree.h (build_noexcept_spec, add_exception_specifier): Adjust
>         declarations.
>         * except.c (build_noexcept_spec): Change the type of the complain
>         parameter to tsubst_flags_t.
>         * typeck2.c (add_exception_specifier): Likewise.
>
> diff --git gcc/cp/cp-tree.h gcc/cp/cp-tree.h
> index 2203e92dda8..efbdad83966 100644
> --- gcc/cp/cp-tree.h
> +++ gcc/cp/cp-tree.h
> @@ -6461,7 +6461,7 @@ extern void perform_deferred_noexcept_checks      (void);
>  extern bool nothrow_spec_p                     (const_tree);
>  extern bool type_noexcept_p                    (const_tree);
>  extern bool type_throw_all_p                   (const_tree);
> -extern tree build_noexcept_spec                        (tree, int);
> +extern tree build_noexcept_spec                        (tree, tsubst_flags_t);
>  extern void choose_personality_routine         (enum languages);
>  extern tree build_must_not_throw_expr          (tree,tree);
>  extern tree eh_type_info                       (tree);
> @@ -7415,7 +7415,7 @@ extern tree build_x_arrow                 (location_t, tree,
>                                                  tsubst_flags_t);
>  extern tree build_m_component_ref              (tree, tree, tsubst_flags_t);
>  extern tree build_functional_cast              (tree, tree, tsubst_flags_t);
> -extern tree add_exception_specifier            (tree, tree, int);
> +extern tree add_exception_specifier            (tree, tree, tsubst_flags_t);
>  extern tree merge_exception_specifiers         (tree, tree);
>
>  /* in mangle.c */
> diff --git gcc/cp/except.c gcc/cp/except.c
> index 2db90eedcf7..3449b59b3cc 100644
> --- gcc/cp/except.c
> +++ gcc/cp/except.c
> @@ -1187,7 +1187,7 @@ type_throw_all_p (const_tree type)
>     constant-expression of EXPR.  COMPLAIN is as for tsubst.  */
>
>  tree
> -build_noexcept_spec (tree expr, int complain)
> +build_noexcept_spec (tree expr, tsubst_flags_t complain)
>  {
>    /* This isn't part of the signature, so don't bother trying to evaluate
>       it until instantiation.  */
> diff --git gcc/cp/typeck2.c gcc/cp/typeck2.c
> index b13ed2660de..fec1db00ca4 100644
> --- gcc/cp/typeck2.c
> +++ gcc/cp/typeck2.c
> @@ -2215,7 +2215,7 @@ build_functional_cast (tree exp, tree parms, tsubst_flags_t complain)
>     know what we're doing.  */
>
>  tree
> -add_exception_specifier (tree list, tree spec, int complain)
> +add_exception_specifier (tree list, tree spec, tsubst_flags_t complain)
>  {
>    bool ok;
>    tree core = spec;



More information about the Gcc-patches mailing list