@@ -1,5 +1,10 @@
2012-03-25 Diego Novillo <dnovillo@google.com>
+ * pph-out.c (pph_out_global_binding_keys): Fix check for empty
+ statement list.
+
+2012-03-25 Diego Novillo <dnovillo@google.com>
+
* mangle.c (write_expression): Handle TRAIT_EXPR when PPH is enabled.
(write_template_arg_literal): Handle CONST_DECLs that do not have
a constant DECL_INITIAL when PPH is enabled.
@@ -2604,8 +2604,7 @@ pph_out_global_binding_keys (pph_stream *stream)
|| scope_chain->x_processing_template_decl
|| scope_chain->x_processing_specialization
|| scope_chain->x_processing_explicit_instantiation
- || scope_chain->need_pop_function_context
- || scope_chain->x_stmt_tree.x_cur_stmt_list)
+ || scope_chain->need_pop_function_context)
&& VEC_empty (tree, scope_chain->x_stmt_tree.x_cur_stmt_list));
/* We need to write a record for BL before emitting the merge keys