diff options
Diffstat (limited to 'gcc/objc')
| -rw-r--r-- | gcc/objc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/objc/objc-act.c | 10 |
2 files changed, 13 insertions, 4 deletions
diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog index 039ad3b1..fb9b664 100644 --- a/gcc/objc/ChangeLog +++ b/gcc/objc/ChangeLog @@ -1,3 +1,10 @@ +2008-09-23 Aldy Hernandez <aldyh@redhat.com> + + * objc-act.c (next_sjlj_build_enter_and_setjmp): Call + c_common_truthvalue_conversion with location. + (next_sjlj_build_catch_list): Same. + (next_sjlj_build_try_catch_finally): Same. + 2008-09-17 Andrew Pinski <andrew_pinski@playstation.sony.com> PR objc/37460 diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c index 837f3cf..9ea40ea 100644 --- a/gcc/objc/objc-act.c +++ b/gcc/objc/objc-act.c @@ -3538,7 +3538,7 @@ next_sjlj_build_enter_and_setjmp (void) sj = build_function_call (objc_setjmp_decl, t); cond = build2 (COMPOUND_EXPR, TREE_TYPE (sj), enter, sj); - cond = c_common_truthvalue_conversion (cond); + cond = c_common_truthvalue_conversion (input_location, cond); return build3 (COND_EXPR, void_type_node, cond, NULL, NULL); } @@ -3605,7 +3605,7 @@ next_sjlj_build_catch_list (void) t = objc_get_class_reference (OBJC_TYPE_NAME (TREE_TYPE (type))); args = tree_cons (NULL, t, args); t = build_function_call (objc_exception_match_decl, args); - cond = c_common_truthvalue_conversion (t); + cond = c_common_truthvalue_conversion (input_location, t); } t = build3 (COND_EXPR, void_type_node, cond, body, NULL); SET_EXPR_LOCUS (t, EXPR_LOCUS (stmt)); @@ -3727,7 +3727,8 @@ next_sjlj_build_try_catch_finally (void) /* Build the complete FINALLY statement list. */ t = next_sjlj_build_try_exit (); t = build_stmt (COND_EXPR, - c_common_truthvalue_conversion (rethrow_decl), + c_common_truthvalue_conversion + (input_location, rethrow_decl), NULL, t); SET_EXPR_LOCATION (t, cur_try_context->finally_locus); append_to_statement_list (t, &TREE_OPERAND (try_fin, 1)); @@ -3738,7 +3739,8 @@ next_sjlj_build_try_catch_finally (void) t = tree_cons (NULL, rethrow_decl, NULL); t = build_function_call (objc_exception_throw_decl, t); t = build_stmt (COND_EXPR, - c_common_truthvalue_conversion (rethrow_decl), + c_common_truthvalue_conversion (input_location, + rethrow_decl), t, NULL); SET_EXPR_LOCATION (t, cur_try_context->end_finally_locus); append_to_statement_list (t, &TREE_OPERAND (try_fin, 1)); |