This commit is contained in:
Jakub Jelinek 2009-12-14 20:54:26 +00:00
parent b0b29e5052
commit d6e42845fd
4 changed files with 69 additions and 5 deletions

View File

@ -1,2 +1,2 @@
fastjar-0.97.tar.gz
gcc-4.4.2-20091211.tar.bz2
gcc-4.4.2-20091214.tar.bz2

View File

@ -1,9 +1,9 @@
%global DATE 20091211
%global SVNREV 155176
%global DATE 20091214
%global SVNREV 155239
%global gcc_version 4.4.2
# Note, gcc_release must be integer, if you want to add suffixes to
# %{release}, append them after %{gcc_release} on Release: line.
%global gcc_release 16
%global gcc_release 17
%global _unpackaged_files_terminate_build 0
%global multilib_64_archs sparc64 ppc64 s390x x86_64
%global include_gappletviewer 1
@ -161,6 +161,7 @@ Patch16: gcc44-unwind-debug-hook.patch
Patch17: gcc44-pr38757.patch
Patch18: gcc44-libstdc++-docs.patch
Patch19: gcc44-ppc64-aixdesc.patch
Patch20: gcc44-pr41183.patch
Patch1000: fastjar-0.97-segfault.patch
@ -466,6 +467,7 @@ which are required to compile with the GNAT.
%patch18 -p0 -b .libstdc++-docs~
%endif
%patch19 -p0 -b .ppc64-aixdesc~
%patch20 -p0 -b .pr41183~
# This testcase doesn't compile.
rm libjava/testsuite/libjava.lang/PR35020*
@ -1851,6 +1853,15 @@ fi
%doc rpm.doc/changelogs/libmudflap/ChangeLog*
%changelog
* Mon Dec 14 2009 Jakub Jelinek <jakub@redhat.com> 4.4.2-17
- propagate TREE_NOTHROW/TREE_READONLY/DECL_PURE_P from ipa-pure-const and
EH opt to all same body aliases (#547286)
- don't emit DWARF location list entries with no location or DW_AT_location
with empty blocks (PR debug/41473)
- fix up AMD LWP support
- don't crash when mangling C++ decls inside of middle-end generated functions
(PR c++/41183)
* Fri Dec 11 2009 Jakub Jelinek <jakub@redhat.com> 4.4.2-16
- update from gcc-4_4-branch
- PRs c++/27425, c++/34274, c++/42301, fortran/42268, java/41991,

53
gcc44-pr41183.patch Normal file
View File

@ -0,0 +1,53 @@
2009-12-14 Jakub Jelinek <jakub@redhat.com>
PR c++/41183
* cp-tree.h (current_class_ptr): Give NULL even when cfun
has NULL cfun->language.
* g++.dg/torture/pr41183.C: New test.
--- gcc/cp/cp-tree.h.jj 2009-09-24 10:21:50.000000000 +0200
+++ gcc/cp/cp-tree.h 2009-12-14 15:06:38.000000000 +0100
@@ -883,7 +883,8 @@ struct language_function GTY(())
expression for `*this'. */
#define current_class_ptr \
- (cfun ? cp_function_chain->x_current_class_ptr : NULL_TREE)
+ (cfun && cp_function_chain \
+ ? cp_function_chain->x_current_class_ptr : NULL_TREE)
#define current_class_ref \
(cfun ? cp_function_chain->x_current_class_ref : NULL_TREE)
--- gcc/testsuite/g++.dg/torture/pr41183.C.jj 2009-12-14 15:10:57.000000000 +0100
+++ gcc/testsuite/g++.dg/torture/pr41183.C 2009-12-14 15:11:01.000000000 +0100
@@ -0,0 +1,30 @@
+// PR c++/41183
+// { dg-do compile }
+
+void foo (const char *);
+
+template <int *>
+struct A
+{
+ template <typename T> A (const int &, T);
+ int i;
+};
+
+template <int *X>
+template <typename T>
+A<X>::A (const int &j, T) : i(j)
+{
+ foo (0);
+ foo (0);
+ foo (__PRETTY_FUNCTION__);
+}
+
+int N;
+
+struct B
+{
+ B ();
+ A<&N> a;
+};
+
+B::B() : a(N, 0) {}

View File

@ -1,2 +1,2 @@
2659f09c2e43ef8b7d4406321753f1b2 fastjar-0.97.tar.gz
10e73e2a3e3d5d5d9ca01395b2af5621 gcc-4.4.2-20091211.tar.bz2
d7c6ca8b8bb6d3748d413614aba9dce2 gcc-4.4.2-20091214.tar.bz2