re PR c++/23357 (ICE with __alignof__ on template arguments)

        PR c++/23357
        * cp-tree.def (SIZEOF_EXPR, ALIGNOF_EXPR): Change code class to
        tcc_expression.

From-SVN: r104340

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 188189f549012fe1c62cb7df19d2e8653f65d6de..683af879ca95e3a011fe78776e0474537e15e2f7 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-15  Jason Merrill  <jason@redhat.com>
+
+       PR c++/23357
+       * cp-tree.def (SIZEOF_EXPR, ALIGNOF_EXPR): Change code class to
+       tcc_expression.
+
 2005-09-15  Mark Mitchell  <mark@codesourcery.com>
 
        PR c++/23896

diff --git a/gcc/cp/cp-tree.def b/gcc/cp/cp-tree.def
index 096d00a8be0d10c0198fd818c000a1803ae51631..6b04818e0c36b1e4cbae70c98171fdc2c086c702 100644 (file)
--- a/gcc/cp/cp-tree.def
+++ b/gcc/cp/cp-tree.def
@@ -324,14 +324,14 @@ DEFTREECODE (TINST_LEVEL, "TINST_LEVEL", tcc_exceptional, 0)
 DEFTREECODE (OFFSETOF_EXPR, "offsetof_expr", tcc_expression, 1)
 
 /* Represents a 'sizeof' expression during template expansion.  */
-DEFTREECODE (SIZEOF_EXPR, "sizeof_expr", tcc_unary, 1)
+DEFTREECODE (SIZEOF_EXPR, "sizeof_expr", tcc_expression, 1)
 
 /* Represents the -> operator during template expansion.  */
 DEFTREECODE (ARROW_EXPR, "arrow_expr", tcc_expression, 1)
 
 /* Represents an '__alignof__' expression during template
    expansion.  */
-DEFTREECODE (ALIGNOF_EXPR, "alignof_expr", tcc_unary, 1)
+DEFTREECODE (ALIGNOF_EXPR, "alignof_expr", tcc_expression, 1)
 
 /* A STMT_EXPR represents a statement-expression during template
    expansion.  This is the GCC extension { ( ... ) }.  The

diff --git a/gcc/testsuite/g++.dg/template/sizeof10.C b/gcc/testsuite/g++.dg/template/sizeof10.C
new file mode 100644 (file)
index 0000000..5ecf13e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/sizeof10.C
@@ -0,0 +1,7 @@
+// PR c++/23357
+
+template<typename T> bool foo()
+{
+    const long int i = sizeof(T) > 1 ? sizeof(T) : 0;
+    return i > 0;
+}