diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2004-09-28 02:56:11 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2004-09-28 02:56:11 +0000 |
| commit | 455f19cb1cc13e726b806d792a8808f55aaa9a07 (patch) | |
| tree | 36630ae2e63d9c79e59704bfce96a6e0b3b33f2c /gcc/cp/call.c | |
| parent | 081077002d07ddac4094b11b1edd5f8d1175bddd (diff) | |
| download | gcc-455f19cb1cc13e726b806d792a8808f55aaa9a07.zip gcc-455f19cb1cc13e726b806d792a8808f55aaa9a07.tar.gz gcc-455f19cb1cc13e726b806d792a8808f55aaa9a07.tar.bz2 | |
re PR c++/17642 (internal compiler error: in invert_truthvalue, at fold-const.c:2997)
PR c++/17642
* stor-layout.c (layout_decl): Use fold_convert, not convert.
(bit_from_pos): Likewise.
(byte_from_pos): Likewise.
(pos_from_bit): Likewise.
(normalize_offset): Likewise.
(place_field): Likewise.
(finalize_type_size): Likewise.
(layout_type): Likewise.
* tree.c (build_index_type): Likewise.
PR c++/17642
* cp-tree.h (fold_if_not_in_template): New function.
* call.c (build_conditional_expr): Use fold_if_not_in_template.
(build_cxx_call): Likewise.
* cvt.c (convert_to_complex): Likewise.
(ocp_convert): Likewise.
(convert): Likewise.
(convert_force): Likewise.
* decl.c (compute_array_index_type): Clear
processing_template_decl while folding array bounds.
* pt.c (convert_nontype_argument): Clear
processing_template_decl while processing non-type argument
initialization.
* tree.c (fold_if_not_in_template): New function.
* typeck.c (build_class_member_access_expr): Use
fold_if_not_in_template.
(build_array_ref): Likewise.
(build_binary_op): Likewise. Do not try to optimize computations
when processing templates.
(cp_pointer_int_sum): Use fold_if_not_in_template.
(pointer_diff): Likewise.
(build_unary_op): Likewise.
(build_reinterpret_cast): Likewise.
(get_delta_difference): Likewise.
(expand_ptrmemfunc_cst): Likewise.
(dubious_conversion_warnings): Likewise.
* g++.dg/template/crash23.C: New test.
From-SVN: r88217
Diffstat (limited to 'gcc/cp/call.c')
| -rw-r--r-- | gcc/cp/call.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gcc/cp/call.c b/gcc/cp/call.c index c5761ec..f61fa2a 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -3442,7 +3442,8 @@ build_conditional_expr (tree arg1, tree arg2, tree arg3) } valid_operands: - result = fold (build3 (COND_EXPR, result_type, arg1, arg2, arg3)); + result = fold_if_not_in_template (build3 (COND_EXPR, result_type, arg1, + arg2, arg3)); /* We can't use result_type below, as fold might have returned a throw_expr. */ @@ -4869,7 +4870,7 @@ build_cxx_call (tree fn, tree args) /* Some built-in function calls will be evaluated at compile-time in fold (). */ - fn = fold (fn); + fn = fold_if_not_in_template (fn); if (VOID_TYPE_P (TREE_TYPE (fn))) return fn; |