| Message ID | 20180730044200.3164-3-joel@jms.id.au |
|---|---|
| State | Superseded |
| Headers | show |
| Series | GCC 7.3 fixes | expand |
V2 is good to install On Sun, Jul 29, 2018 at 9:42 PM Joel Stanley <joel@jms.id.au> wrote: > C++ applications that contain a specfic use of std::pair with tempates > cause the build to require many gigabytes of RAM to build. > > This is a fix that was applied to the upstream GCC 7 branch. > > Change-Id: I213f96d1d6332e2dce5765482ff3413f1abd7ff8 > Signed-off-by: Joel Stanley <joel@jms.id.au> > --- > meta/recipes-devtools/gcc/gcc-7.3.inc | 1 + > ...-PR-c-80290-memory-hog-with-std-pair.patch | 58 +++++++++++++++++++ > 2 files changed, 59 insertions(+) > create mode 100644 > meta/recipes-devtools/gcc/gcc-7.3/0001-PR-c-80290-memory-hog-with-std-pair.patch > > diff --git a/meta/recipes-devtools/gcc/gcc-7.3.inc > b/meta/recipes-devtools/gcc/gcc-7.3.inc > index 81320dc52a59..c7c88f12e499 100644 > --- a/meta/recipes-devtools/gcc/gcc-7.3.inc > +++ b/meta/recipes-devtools/gcc/gcc-7.3.inc > @@ -80,6 +80,7 @@ BACKPORTS = "\ > file://0001-Fix-internal-compiler-error-in-testcase.patch \ > file://0001-PR-rtl-optimization-83030.patch \ > file://0001-Fix-ppc64le-build-Partial-backport-r256656.patch \ > + file://0001-PR-c-80290-memory-hog-with-std-pair.patch \ > " > > SRC_URI[md5sum] = "be2da21680f27624f3a87055c4ba5af2" > diff --git > a/meta/recipes-devtools/gcc/gcc-7.3/0001-PR-c-80290-memory-hog-with-std-pair.patch > b/meta/recipes-devtools/gcc/gcc-7.3/0001-PR-c-80290-memory-hog-with-std-pair.patch > new file mode 100644 > index 000000000000..ba43af92fff1 > --- /dev/null > +++ > b/meta/recipes-devtools/gcc/gcc-7.3/0001-PR-c-80290-memory-hog-with-std-pair.patch > @@ -0,0 +1,58 @@ > +From 8c014bceeca6a558519e86b16a8142accc41e94f Mon Sep 17 00:00:00 2001 > +From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> > +Date: Thu, 28 Jun 2018 00:25:21 +0000 > +Subject: [PATCH] PR c++/80290 - memory-hog with std::pair. > + > + * pt.c (type_unification_real): Skip non-dependent conversion > + check for a nested list argument. > + (braced_init_depth): New. > + > +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@262204 > 138bc75d-0d04-0410-961f-82ee72b054a4 > +Signed-off-by: Joel Stanley <joel@jms.id.au> > +--- > + gcc/cp/pt.c | 22 ++++++++++++++++++++++ > + 1 file changed, 22 insertions(+) > + > +diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c > +index 79cfd0129226..71077a3b0498 100644 > +--- a/gcc/cp/pt.c > ++++ b/gcc/cp/pt.c > +@@ -19242,6 +19242,24 @@ try_array_deduction (tree tparms, tree targs, > tree parm) > + /*nondeduced*/false, array_deduction_r); > + } > + > ++/* Returns how many levels of { } INIT contains. */ > ++ > ++static int > ++braced_init_depth (tree init) > ++{ > ++ if (!init || !BRACE_ENCLOSED_INITIALIZER_P (init)) > ++ return 0; > ++ unsigned i; tree val; > ++ unsigned max = 0; > ++ FOR_EACH_CONSTRUCTOR_VALUE (CONSTRUCTOR_ELTS (init), i, val) > ++ { > ++ unsigned elt_d = braced_init_depth (val); > ++ if (elt_d > max) > ++ max = elt_d; > ++ } > ++ return max + 1; > ++} > ++ > + /* Most parms like fn_type_unification. > + > + If SUBR is 1, we're being called recursively (to unify the > +@@ -19478,6 +19496,10 @@ type_unification_real (tree tparms, > + > + if (uses_template_parms (parm)) > + continue; > ++ /* Workaround for c++/80290: avoid combinatorial explosion on > ++ deeply nested braced init-lists. */ > ++ if (braced_init_depth (arg) > 2) > ++ continue; > + if (check_non_deducible_conversion (parm, arg, strict, flags, > + explain_p)) > + return 1; > +-- > +2.17.1 > + > -- > 2.17.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > <div><div dir="auto">V2 is good to install</div></div><div><br><div class="gmail_quote"><div dir="ltr">On Sun, Jul 29, 2018 at 9:42 PM Joel Stanley <<a href="mailto:joel@jms.id.au">joel@jms.id.au</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">C++ applications that contain a specfic use of std::pair with tempates<br> cause the build to require many gigabytes of RAM to build.<br> <br> This is a fix that was applied to the upstream GCC 7 branch.<br> <br> Change-Id: I213f96d1d6332e2dce5765482ff3413f1abd7ff8<br> Signed-off-by: Joel Stanley <<a href="mailto:joel@jms.id.au" target="_blank">joel@jms.id.au</a>><br> ---<br> meta/recipes-devtools/gcc/gcc-7.3.inc | 1 +<br> ...-PR-c-80290-memory-hog-with-std-pair.patch | 58 +++++++++++++++++++<br> 2 files changed, 59 insertions(+)<br> create mode 100644 meta/recipes-devtools/gcc/gcc-7.3/0001-PR-c-80290-memory-hog-with-std-pair.patch<br> <br> diff --git a/meta/recipes-devtools/gcc/gcc-7.3.inc b/meta/recipes-devtools/gcc/gcc-7.3.inc<br> index 81320dc52a59..c7c88f12e499 100644<br> --- a/meta/recipes-devtools/gcc/gcc-7.3.inc<br> +++ b/meta/recipes-devtools/gcc/gcc-7.3.inc<br> @@ -80,6 +80,7 @@ BACKPORTS = "\<br> file://0001-Fix-internal-compiler-error-in-testcase.patch \<br> file://0001-PR-rtl-optimization-83030.patch \<br> file://0001-Fix-ppc64le-build-Partial-backport-r256656.patch \<br> + file://0001-PR-c-80290-memory-hog-with-std-pair.patch \<br> "<br> <br> SRC_URI[md5sum] = "be2da21680f27624f3a87055c4ba5af2"<br> diff --git a/meta/recipes-devtools/gcc/gcc-7.3/0001-PR-c-80290-memory-hog-with-std-pair.patch b/meta/recipes-devtools/gcc/gcc-7.3/0001-PR-c-80290-memory-hog-with-std-pair.patch<br> new file mode 100644<br> index 000000000000..ba43af92fff1<br> --- /dev/null<br> +++ b/meta/recipes-devtools/gcc/gcc-7.3/0001-PR-c-80290-memory-hog-with-std-pair.patch<br> @@ -0,0 +1,58 @@<br> +From 8c014bceeca6a558519e86b16a8142accc41e94f Mon Sep 17 00:00:00 2001<br> +From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4><br> +Date: Thu, 28 Jun 2018 00:25:21 +0000<br> +Subject: [PATCH] PR c++/80290 - memory-hog with std::pair.<br> +<br> + * pt.c (type_unification_real): Skip non-dependent conversion<br> + check for a nested list argument.<br> + (braced_init_depth): New.<br> +<br> +git-svn-id: svn+ssh://<a href="http://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@262204" rel="noreferrer" target="_blank">gcc.gnu.org/svn/gcc/branches/gcc-7-branch@262204</a> 138bc75d-0d04-0410-961f-82ee72b054a4<br> +Signed-off-by: Joel Stanley <<a href="mailto:joel@jms.id.au" target="_blank">joel@jms.id.au</a>><br> +---<br> + gcc/cp/pt.c | 22 ++++++++++++++++++++++<br> + 1 file changed, 22 insertions(+)<br> +<br> +diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c<br> +index 79cfd0129226..71077a3b0498 100644<br> +--- a/gcc/cp/pt.c<br> ++++ b/gcc/cp/pt.c<br> +@@ -19242,6 +19242,24 @@ try_array_deduction (tree tparms, tree targs, tree parm)<br> + /*nondeduced*/false, array_deduction_r);<br> + }<br> + <br> ++/* Returns how many levels of { } INIT contains. */<br> ++<br> ++static int<br> ++braced_init_depth (tree init)<br> ++{<br> ++ if (!init || !BRACE_ENCLOSED_INITIALIZER_P (init))<br> ++ return 0;<br> ++ unsigned i; tree val;<br> ++ unsigned max = 0;<br> ++ FOR_EACH_CONSTRUCTOR_VALUE (CONSTRUCTOR_ELTS (init), i, val)<br> ++ {<br> ++ unsigned elt_d = braced_init_depth (val);<br> ++ if (elt_d > max)<br> ++ max = elt_d;<br> ++ }<br> ++ return max + 1;<br> ++}<br> ++<br> + /* Most parms like fn_type_unification.<br> + <br> + If SUBR is 1, we're being called recursively (to unify the<br> +@@ -19478,6 +19496,10 @@ type_unification_real (tree tparms,<br> + <br> + if (uses_template_parms (parm))<br> + continue;<br> ++ /* Workaround for c++/80290: avoid combinatorial explosion on<br> ++ deeply nested braced init-lists. */<br> ++ if (braced_init_depth (arg) > 2)<br> ++ continue;<br> + if (check_non_deducible_conversion (parm, arg, strict, flags,<br> + explain_p))<br> + return 1;<br> +-- <br> +2.17.1<br> +<br> -- <br> 2.17.1<br> <br> -- <br> _______________________________________________<br> Openembedded-core mailing list<br> <a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank">Openembedded-core@lists.openembedded.org</a><br> <a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br> </blockquote></div></div> -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
diff --git a/meta/recipes-devtools/gcc/gcc-7.3.inc b/meta/recipes-devtools/gcc/gcc-7.3.inc index 81320dc52a59..c7c88f12e499 100644 --- a/meta/recipes-devtools/gcc/gcc-7.3.inc +++ b/meta/recipes-devtools/gcc/gcc-7.3.inc @@ -80,6 +80,7 @@ BACKPORTS = "\ file://0001-Fix-internal-compiler-error-in-testcase.patch \ file://0001-PR-rtl-optimization-83030.patch \ file://0001-Fix-ppc64le-build-Partial-backport-r256656.patch \ + file://0001-PR-c-80290-memory-hog-with-std-pair.patch \ " SRC_URI[md5sum] = "be2da21680f27624f3a87055c4ba5af2" diff --git a/meta/recipes-devtools/gcc/gcc-7.3/0001-PR-c-80290-memory-hog-with-std-pair.patch b/meta/recipes-devtools/gcc/gcc-7.3/0001-PR-c-80290-memory-hog-with-std-pair.patch new file mode 100644 index 000000000000..ba43af92fff1 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-7.3/0001-PR-c-80290-memory-hog-with-std-pair.patch @@ -0,0 +1,58 @@ +From 8c014bceeca6a558519e86b16a8142accc41e94f Mon Sep 17 00:00:00 2001 +From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> +Date: Thu, 28 Jun 2018 00:25:21 +0000 +Subject: [PATCH] PR c++/80290 - memory-hog with std::pair. + + * pt.c (type_unification_real): Skip non-dependent conversion + check for a nested list argument. + (braced_init_depth): New. + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@262204 138bc75d-0d04-0410-961f-82ee72b054a4 +Signed-off-by: Joel Stanley <joel@jms.id.au> +--- + gcc/cp/pt.c | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + +diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c +index 79cfd0129226..71077a3b0498 100644 +--- a/gcc/cp/pt.c ++++ b/gcc/cp/pt.c +@@ -19242,6 +19242,24 @@ try_array_deduction (tree tparms, tree targs, tree parm) + /*nondeduced*/false, array_deduction_r); + } + ++/* Returns how many levels of { } INIT contains. */ ++ ++static int ++braced_init_depth (tree init) ++{ ++ if (!init || !BRACE_ENCLOSED_INITIALIZER_P (init)) ++ return 0; ++ unsigned i; tree val; ++ unsigned max = 0; ++ FOR_EACH_CONSTRUCTOR_VALUE (CONSTRUCTOR_ELTS (init), i, val) ++ { ++ unsigned elt_d = braced_init_depth (val); ++ if (elt_d > max) ++ max = elt_d; ++ } ++ return max + 1; ++} ++ + /* Most parms like fn_type_unification. + + If SUBR is 1, we're being called recursively (to unify the +@@ -19478,6 +19496,10 @@ type_unification_real (tree tparms, + + if (uses_template_parms (parm)) + continue; ++ /* Workaround for c++/80290: avoid combinatorial explosion on ++ deeply nested braced init-lists. */ ++ if (braced_init_depth (arg) > 2) ++ continue; + if (check_non_deducible_conversion (parm, arg, strict, flags, + explain_p)) + return 1; +-- +2.17.1 +
C++ applications that contain a specfic use of std::pair with tempates cause the build to require many gigabytes of RAM to build. This is a fix that was applied to the upstream GCC 7 branch. Change-Id: I213f96d1d6332e2dce5765482ff3413f1abd7ff8 Signed-off-by: Joel Stanley <joel@jms.id.au> --- meta/recipes-devtools/gcc/gcc-7.3.inc | 1 + ...-PR-c-80290-memory-hog-with-std-pair.patch | 58 +++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 meta/recipes-devtools/gcc/gcc-7.3/0001-PR-c-80290-memory-hog-with-std-pair.patch -- 2.17.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core