2004-10-10 Andrew Pinski <pinskia@physics.uc.edu>
PR c++/17554
part of c++/17657
middle-end/17703
* semantics.c (maybe_cleanup_point_expr): Call
fold_build_cleanup_point_expr.
(maybe_cleanup_point_expr_void): New function.
(add_decl_expr): Call maybe_cleanup_point_expr_void.
(finish_expr_stmt): Likewise.
(finish_return_stmt): Likewise.
(finish_for_expr): Likewise.
(finish_asm_stmt): Likewise.
* typeck.c (condition_conversion): Call
fold_build_cleanup_point_expr.
2004-10-10 Andrew Pinski <pinskia@physics.uc.edu>
PR middle-end/17703
part of PR c++/17657
* fold-const.c (fold_build_cleanup_point_expr): New function.
* tree.h (fold_build_cleanup_point_expr): Prototype.
2004-10-10 Andrew Pinski <pinskia@physics.uc.edu>
PR c++/17554
* g++.dg/init/for3.C: New test.
PR c++/17657
* g++.dg/opt/switch2.C: New test.
PR middle-end/17703
* g++.dg/warn/Wreturn-2.C: New test.
From-SVN: r88869
+2004-10-10 Andrew Pinski <pinskia@physics.uc.edu>
+
+ PR middle-end/17703
+ part of PR c++/17657
+ * fold-const.c (fold_build_cleanup_point_expr): New function.
+ * tree.h (fold_build_cleanup_point_expr): Prototype.
+
2004-10-10 Eric Christopher <echristo@redhat.com>
* dwarf2out.c: Move attribute to subprogram declaration
2004-10-10 Eric Christopher <echristo@redhat.com>
* dwarf2out.c: Move attribute to subprogram declaration
+2004-10-10 Andrew Pinski <pinskia@physics.uc.edu>
+
+ PR c++/17554
+ part of c++/17657
+ middle-end/17703
+ * semantics.c (maybe_cleanup_point_expr): Call
+ fold_build_cleanup_point_expr.
+ (maybe_cleanup_point_expr_void): New function.
+ (add_decl_expr): Call maybe_cleanup_point_expr_void.
+ (finish_expr_stmt): Likewise.
+ (finish_return_stmt): Likewise.
+ (finish_for_expr): Likewise.
+ (finish_asm_stmt): Likewise.
+ * typeck.c (condition_conversion): Call
+ fold_build_cleanup_point_expr.
+
2004-10-10 Andrew Pinski <pinskia@physics.uc.edu>
PR c++/17907
2004-10-10 Andrew Pinski <pinskia@physics.uc.edu>
PR c++/17907
maybe_cleanup_point_expr (tree expr)
{
if (!processing_template_decl && stmts_are_full_exprs_p ())
maybe_cleanup_point_expr (tree expr)
{
if (!processing_template_decl && stmts_are_full_exprs_p ())
- expr = build1 (CLEANUP_POINT_EXPR, TREE_TYPE (expr), expr);
+ expr = fold_build_cleanup_point_expr (TREE_TYPE (expr), expr);
+/* Like maybe_cleanup_point_expr except have the type of the new expression be
+ void so we don't need to create a temprary variable to hold the inner
+ expression. The reason why we do this is because the orginal type might be
+ an aggregate and we cannot create a temprary variable for that type. */
+
+static tree
+maybe_cleanup_point_expr_void (tree expr)
+{
+ if (!processing_template_decl && stmts_are_full_exprs_p ())
+ expr = fold_build_cleanup_point_expr (void_type_node, expr);
+ return expr;
+}
+
+
+
/* Create a declaration statement for the declaration given by the DECL. */
void
/* Create a declaration statement for the declaration given by the DECL. */
void
tree r = build_stmt (DECL_EXPR, decl);
if (DECL_INITIAL (decl)
|| (DECL_SIZE (decl) && TREE_SIDE_EFFECTS (DECL_SIZE (decl))))
tree r = build_stmt (DECL_EXPR, decl);
if (DECL_INITIAL (decl)
|| (DECL_SIZE (decl) && TREE_SIDE_EFFECTS (DECL_SIZE (decl))))
- r = maybe_cleanup_point_expr (r);
+ r = maybe_cleanup_point_expr_void (r);
{
if (TREE_CODE (expr) != EXPR_STMT)
expr = build_stmt (EXPR_STMT, expr);
{
if (TREE_CODE (expr) != EXPR_STMT)
expr = build_stmt (EXPR_STMT, expr);
- expr = maybe_cleanup_point_expr (expr);
+ expr = maybe_cleanup_point_expr_void (expr);
}
r = build_stmt (RETURN_EXPR, expr);
}
r = build_stmt (RETURN_EXPR, expr);
- r = maybe_cleanup_point_expr (r);
+ r = maybe_cleanup_point_expr_void (r);
r = add_stmt (r);
finish_stmt ();
r = add_stmt (r);
finish_stmt ();
cxx_incomplete_type_error (expr, TREE_TYPE (expr));
expr = error_mark_node;
}
cxx_incomplete_type_error (expr, TREE_TYPE (expr));
expr = error_mark_node;
}
- expr = maybe_cleanup_point_expr (expr);
+ expr = maybe_cleanup_point_expr_void (expr);
FOR_EXPR (for_stmt) = expr;
}
FOR_EXPR (for_stmt) = expr;
}
output_operands, input_operands,
clobbers);
ASM_VOLATILE_P (r) = volatile_p;
output_operands, input_operands,
clobbers);
ASM_VOLATILE_P (r) = volatile_p;
- r = maybe_cleanup_point_expr (r);
+ r = maybe_cleanup_point_expr_void (r);
if (processing_template_decl)
return expr;
t = perform_implicit_conversion (boolean_type_node, expr);
if (processing_template_decl)
return expr;
t = perform_implicit_conversion (boolean_type_node, expr);
- t = build1 (CLEANUP_POINT_EXPR, boolean_type_node, t);
+ t = fold_build_cleanup_point_expr (boolean_type_node, t);
return constant_boolean_node (result, type);
}
return constant_boolean_node (result, type);
}
+/* Build an expression for the a clean point containing EXPR with type TYPE.
+ Don't build a cleanup point expression for EXPR which don't have side
+ effects. */
+
+tree
+fold_build_cleanup_point_expr (tree type, tree expr)
+{
+ /* If the expression does not have side effects then we don't have to wrap
+ it with a cleanup point expression. */
+ if (!TREE_SIDE_EFFECTS (expr))
+ return expr;
+
+ return build1 (CLEANUP_POINT_EXPR, type, expr);
+}
+
/* Build an expression for the address of T. Folds away INDIRECT_REF to
avoid confusing the gimplify process. */
/* Build an expression for the address of T. Folds away INDIRECT_REF to
avoid confusing the gimplify process. */
+2004-10-10 Andrew Pinski <pinskia@physics.uc.edu>
+
+ PR c++/17554
+ * g++.dg/init/for3.C: New test.
+
+ PR c++/17657
+ * g++.dg/opt/switch2.C: New test.
+
+ PR middle-end/17703
+ * g++.dg/warn/Wreturn-2.C: New test.
+
2004-10-10 Andrew Pinski <pinskia@physics.uc.edu>
PR c++/17907
2004-10-10 Andrew Pinski <pinskia@physics.uc.edu>
PR c++/17907
--- /dev/null
+// { dg-do compile }
+
+struct A { int i; A(); A(const A&); };
+
+void bar()
+{
+ A a;
+ for ( ;; a=A() ) ;
+}
--- /dev/null
+// { dg-do compile }
+// { dg-options "-O2" }
+
+extern int foo (int);
+
+void
+bar (void)
+{
+ char tmp = foo (0);
+ switch (tmp)
+ {
+ case 1: foo (1); break;
+ case 2: foo (2); break;
+ case 3: foo (3); break;
+ case 4: foo (4); break;
+ case 5: foo (5); break;
+ case 6: foo (6); break;
+ case 7: foo (7); break;
+ case 255: foo (8); break;
+ default: break;
+ }
+}
+
--- /dev/null
+// { dg-do compile }
+int foo(int first) {
+ while (true) {
+ return first;
+ }
+} // { dg-bogus "control reaches" }
+
extern tree fold_read_from_constant_string (tree);
extern tree int_const_binop (enum tree_code, tree, tree, int);
extern tree build_fold_addr_expr (tree);
extern tree fold_read_from_constant_string (tree);
extern tree int_const_binop (enum tree_code, tree, tree, int);
extern tree build_fold_addr_expr (tree);
+tree fold_build_cleanup_point_expr (tree type, tree expr);
extern tree build_fold_addr_expr_with_type (tree, tree);
extern tree build_fold_indirect_ref (tree);
extern tree constant_boolean_node (int, tree);
extern tree build_fold_addr_expr_with_type (tree, tree);
extern tree build_fold_indirect_ref (tree);
extern tree constant_boolean_node (int, tree);