diff options
| author | jsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-03-23 01:35:06 +0000 |
|---|---|---|
| committer | jsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-03-23 01:35:06 +0000 |
| commit | 45a78cc0d27599fccb48470d7f89b113b7fcb446 (patch) | |
| tree | 2dc0be928c289ceb6e2df4ae5cf04396eb70721e /gcc/objc | |
| parent | b96dc1214cf672f219471ff29ee90c6c109393c5 (diff) | |
| download | gcc-45a78cc0d27599fccb48470d7f89b113b7fcb446.tar.gz | |
* c-common.c (c_common_truthvalue_conversion): Adjust comment.
Call c_common_truthvalue_conversion rather than
lang_hooks.truthvalue_conversion.
* c-convert.c (convert): Call c_objc_common_truthvalue_conversion.
* c-objc-common.c (c_objc_common_truthvalue_conversion): Move to
c-typeck.c.
* c-objc-common.h (LANG_HOOKS_TRUTHVALUE_CONVERSION): Change to
c_common_truthvalue_conversion.
* c-parser.c (c_parser_paren_condition, c_parser_for_statement,
c_parser_conditional_expression, c_parser_binary_expression): Call
c_objc_common_truthvalue_conversion.
* c-typeck.c (build_unary_op): Call
c_objc_common_truthvalue_conversion.
(build_conditional_expr): Do not call
lang_hooks.truthvalue_conversion.
(build_binary_op): Call c_common_truthvalue_conversion.
(c_objc_common_truthvalue_conversion): Moved from
c-objc-common.c. Call default_function_array_conversion instead
of default_conversion.
objc:
* objc-act.c (next_sjlj_build_enter_and_setjmp,
next_sjlj_build_catch_list, next_sjlj_build_try_catch_finally):
Call c_common_truthvalue_conversion.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@96917 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/objc')
| -rw-r--r-- | gcc/objc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/objc/objc-act.c | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog index 49e73af4960..00df6c3dffd 100644 --- a/gcc/objc/ChangeLog +++ b/gcc/objc/ChangeLog @@ -1,3 +1,9 @@ +2005-03-23 Joseph S. Myers <joseph@codesourcery.com> + + * objc-act.c (next_sjlj_build_enter_and_setjmp, + next_sjlj_build_catch_list, next_sjlj_build_try_catch_finally): + Call c_common_truthvalue_conversion. + 2005-02-25 Joseph S. Myers <joseph@codesourcery.com> * Make-lang.in (objc/objc-parse.o-warn, objc/objc-parse.o, diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c index e6201afbad5..1848e3c6c47 100644 --- a/gcc/objc/objc-act.c +++ b/gcc/objc/objc-act.c @@ -3019,7 +3019,7 @@ next_sjlj_build_enter_and_setjmp (void) sj = build_function_call (objc_setjmp_decl, t); cond = build (COMPOUND_EXPR, TREE_TYPE (sj), enter, sj); - cond = lang_hooks.truthvalue_conversion (cond); + cond = c_common_truthvalue_conversion (cond); return build (COND_EXPR, void_type_node, cond, NULL, NULL); } @@ -3086,7 +3086,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 = lang_hooks.truthvalue_conversion (t); + cond = c_common_truthvalue_conversion (t); } t = build (COND_EXPR, void_type_node, cond, body, NULL); SET_EXPR_LOCUS (t, EXPR_LOCUS (stmt)); @@ -3208,7 +3208,7 @@ next_sjlj_build_try_catch_finally (void) /* Build the complete FINALLY statement list. */ t = next_sjlj_build_try_exit (); t = build_stmt (COND_EXPR, - lang_hooks.truthvalue_conversion (rethrow_decl), + c_common_truthvalue_conversion (rethrow_decl), NULL, t); SET_EXPR_LOCATION (t, cur_try_context->finally_locus); append_to_statement_list (t, &TREE_OPERAND (try_fin, 1)); @@ -3219,7 +3219,7 @@ 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, - lang_hooks.truthvalue_conversion (rethrow_decl), + c_common_truthvalue_conversion (rethrow_decl), t, NULL); SET_EXPR_LOCATION (t, cur_try_context->end_finally_locus); append_to_statement_list (t, &TREE_OPERAND (try_fin, 1)); |