diff options
| author | Jason Merrill <jason@redhat.com> | 2017-02-03 17:42:37 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2017-02-03 17:42:37 -0500 |
| commit | 77095a6ab13996a38b0a360d8ef9fc6cc6bc5234 (patch) | |
| tree | 3d5b23c76bf199ee7e8f14bc642997ba0d96ab88 /gcc/cp/class.c | |
| parent | ac6dbb1a4042eaa719afbb9c7a02e4f409b8aa75 (diff) | |
| download | gcc-77095a6ab13996a38b0a360d8ef9fc6cc6bc5234.zip gcc-77095a6ab13996a38b0a360d8ef9fc6cc6bc5234.tar.gz gcc-77095a6ab13996a38b0a360d8ef9fc6cc6bc5234.tar.bz2 | |
PR c++/78689 - ICE on constructor with label
gcc/
* tree-inline.c (copy_tree_body_r) [COND_EXPR]: Revert change to
avoid copying non-taken branch.
gcc/cp/
* optimize.c (maybe_clone_body): Replace omitted parameters with
null lvalues.
* class.c (build_clone): Fix logic for omitting inherited parms.
From-SVN: r245172
Diffstat (limited to 'gcc/cp/class.c')
| -rw-r--r-- | gcc/cp/class.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/cp/class.c b/gcc/cp/class.c index d99ebcd..7ec07c9 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -4818,7 +4818,7 @@ build_clone (tree fn, tree name) /* A base constructor inheriting from a virtual base doesn't get the arguments. */ - if (ctor_omit_inherited_parms (fn)) + if (ctor_omit_inherited_parms (clone)) DECL_CHAIN (DECL_CHAIN (DECL_ARGUMENTS (clone))) = NULL_TREE; for (parms = DECL_ARGUMENTS (clone); parms; parms = DECL_CHAIN (parms)) |