From c9d5259d14d812b4c3257036918779c54a2b7c01 Mon Sep 17 00:00:00 2001
From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 16 Sep 2005 06:50:56 +0000
Subject: [PATCH]         PR c++/23357         * cp-tree.def (SIZEOF_EXPR,
 ALIGNOF_EXPR): Change code class to         tcc_expression.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@104340 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/cp/ChangeLog                         | 6 ++++++
 gcc/cp/cp-tree.def                       | 4 ++--
 gcc/testsuite/g++.dg/template/sizeof10.C | 7 +++++++
 3 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/template/sizeof10.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 188189f5490..683af879ca9 100644
--- 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 096d00a8be0..6b04818e0c3 100644
--- 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
index 00000000000..5ecf13e1320
--- /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;
+}
-- 
2.11.4.GIT