re PR c++/47589 (internal compiler error: Segmentation fault)

2011-02-03  Jonathan Wakely  <jwakely.gcc@gmail.com>

	PR c++/47589
	Backport from mainline
	2010-11-09  Jakub Jelinek  <jakub@redhat.com>

	PR c++/45894
	* tree.c (lvalue_kind): Don't crash if ref has NULL type.

From-SVN: r169813

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e780d2a25bae8e89f83a7aeea42c218eec2f69f7..2dc4781655bd18efdbe82f3fda473dbe9a26d822 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,12 @@
+2011-02-03  Jonathan Wakely  <jwakely.gcc@gmail.com>
+
+       PR c++/47589
+       Backport from mainline
+       2010-11-09  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c++/45894
+       * tree.c (lvalue_kind): Don't crash if ref has NULL type.
+
 2010-12-07  Jakub Jelinek  <jakub@redhat.com>
 
        Backport from mainline

diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 45e0c33bd5827917a4403a92d3c554c3f1431c2d..ec069b0ca2169ac9b7ea623fbcb221ed8b8a25cb 100644 (file)
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -72,7 +72,8 @@ lvalue_p_1 (tree ref)
          == REFERENCE_TYPE)
     return lvalue_p_1 (TREE_OPERAND (ref, 0));
 
-  if (TREE_CODE (TREE_TYPE (ref)) == REFERENCE_TYPE)
+  if (TREE_TYPE (ref)
+      && TREE_CODE (TREE_TYPE (ref)) == REFERENCE_TYPE)
     {
       /* unnamed rvalue references are rvalues */
       if (TYPE_REF_IS_RVALUE (TREE_TYPE (ref))

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index dc19e213f65e79c5a3141048958e66fb278feda9..438f912b3485cff47e39918fadfab308af2962a6 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-03  Jonathan Wakely  <jwakely.gcc@gmail.com>
+
+       PR c++/47589
+       * g++.dg/pr47589.C: New test.
+
 2011-01-31  Nathan Froyd  <froydnj@codesourcery.com>
 
        Backport from mainline:

diff --git a/gcc/testsuite/g++.dg/pr47589.C b/gcc/testsuite/g++.dg/pr47589.C
new file mode 100644 (file)
index 0000000..6bc3c80
--- /dev/null
+++ b/gcc/testsuite/g++.dg/pr47589.C
@@ -0,0 +1,26 @@
+// PR c++/47589
+// { dg-do compile }
+
+struct F
+{
+    typedef void(*Cb)();
+
+    F(Cb);
+};
+
+struct C
+{
+    template<class D> static void f();
+};
+
+template<class D>
+struct TF : F
+{
+    TF() : F(C::f<D>) { }
+};
+
+struct DTC : TF<DTC>
+{
+    DTC() { }
+};
+