From ba29e5c26fc00c246fac8e6f225d2fe095666714 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Fri, 16 Nov 2012 15:33:44 +0100
Subject: [PATCH] re PR c++/55337 (ICE tree check: expected sizeof_expr, have
alignof_expr in cp_tree_equal, at cp/tree.c:2608)
PR c++/55337
* tree.c (cp_tree_equal) <case ALIGNOF_EXPR>: Use SIZEOF_EXPR_TYPE_P
only on SIZEOF_EXPR.
* g++.dg/template/alignof2.C: New test.
From-SVN: r193558
---
gcc/cp/ChangeLog | 6 ++++++
gcc/cp/tree.c | 11 +++++++----
gcc/testsuite/ChangeLog | 5 +++++
gcc/testsuite/g++.dg/template/alignof2.C | 9 +++++++++
4 files changed, 27 insertions(+), 4 deletions(-)
create mode 100644 gcc/testsuite/g++.dg/template/alignof2.C
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 232822a59083..6f9380935086 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-16 Jakub Jelinek <jakub@redhat.com>
+
+ PR c++/55337
+ * tree.c (cp_tree_equal) <case ALIGNOF_EXPR>: Use SIZEOF_EXPR_TYPE_P
+ only on SIZEOF_EXPR.
+
2012-11-14 Jason Merrill <jason@redhat.com>
PR c++/54903
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 5df7b6c8a760..bc81daccb8ea 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -2610,10 +2610,13 @@ cp_tree_equal (tree t1, tree t2)
tree o1 = TREE_OPERAND (t1, 0);
tree o2 = TREE_OPERAND (t2, 0);
- if (SIZEOF_EXPR_TYPE_P (t1))
- o1 = TREE_TYPE (o1);
- if (SIZEOF_EXPR_TYPE_P (t2))
- o2 = TREE_TYPE (o2);
+ if (code1 == SIZEOF_EXPR)
+ {
+ if (SIZEOF_EXPR_TYPE_P (t1))
+ o1 = TREE_TYPE (o1);
+ if (SIZEOF_EXPR_TYPE_P (t2))
+ o2 = TREE_TYPE (o2);
+ }
if (TREE_CODE (o1) != TREE_CODE (o2))
return false;
if (TYPE_P (o1))
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6b297ee43eba..d163db26f1bd 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-16 Jakub Jelinek <jakub@redhat.com>
+
+ PR c++/55337
+ * g++.dg/template/alignof2.C: New test.
+
2012-11-16 Uros Bizjak <ubizjak@gmail.com>
* g++.dg/mv1.C (dg-options): Add -march=x86-64.
diff --git a/gcc/testsuite/g++.dg/template/alignof2.C b/gcc/testsuite/g++.dg/template/alignof2.C
new file mode 100644
index 000000000000..f9898980d60d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/alignof2.C
@@ -0,0 +1,9 @@
+// PR c++/55337
+// { dg-do compile }
+
+template <int> struct A;
+template <typename T> struct B
+{
+ static A <__alignof__ (T)> b;
+};
+template <typename T> A<__alignof__ (T)> B<T>::b;
--
GitLab