diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 74ae4ae4d98..897a54edb4e 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-09  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/36408
+	* semantics.c (stmt_expr_value_expr): Don't crash on empty
+	STATEMENT_LIST.
+
 2008-06-08  Paolo Carlini  <paolo.carlini@oracle.com>
 
         PR c++/35242
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 83d23394cb5..f39b8d1eb17 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -1778,7 +1778,7 @@ stmt_expr_value_expr (tree stmt_expr)
   if (TREE_CODE (t) == BIND_EXPR)
     t = BIND_EXPR_BODY (t);
 
-  if (TREE_CODE (t) == STATEMENT_LIST)
+  if (TREE_CODE (t) == STATEMENT_LIST && STATEMENT_LIST_TAIL (t))
     t = STATEMENT_LIST_TAIL (t)->stmt;
 
   if (TREE_CODE (t) == EXPR_STMT)