diff options
author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-05-22 09:14:46 +0000 |
---|---|---|
committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-05-22 09:14:46 +0000 |
commit | 16b2cbfcfe283be47dd6b415c0083eea14a1db59 (patch) | |
tree | a68cc3fcc43337450658f348e9c51b5e33e75b5f /gcc/objc | |
parent | 2da704e65c6e89d11160f314421acaa8db26a94d (diff) | |
download | gcc-16b2cbfcfe283be47dd6b415c0083eea14a1db59.tar.gz |
2013-05-22 Paolo Carlini <paolo.carlini@oracle.com>
* objc-next-runtime-abi-02.c (build_v2_build_objc_method_call):
Fix build_conditional_expr call.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@199187 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/objc')
-rw-r--r-- | gcc/objc/ChangeLog | 5 | ||||
-rw-r--r-- | gcc/objc/objc-next-runtime-abi-02.c | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog index d4ed4187abe..2cdad9c1bcc 100644 --- a/gcc/objc/ChangeLog +++ b/gcc/objc/ChangeLog @@ -1,3 +1,8 @@ +2013-05-22 Paolo Carlini <paolo.carlini@oracle.com> + + * objc-next-runtime-abi-02.c (build_v2_build_objc_method_call): + Fix build_conditional_expr call. + 2013-05-16 Jason Merrill <jason@redhat.com> * Make-lang.in (cc1obj$(exeext)): Use link mutex. diff --git a/gcc/objc/objc-next-runtime-abi-02.c b/gcc/objc/objc-next-runtime-abi-02.c index 8ce0c22d397..70cb62ea3c7 100644 --- a/gcc/objc/objc-next-runtime-abi-02.c +++ b/gcc/objc/objc-next-runtime-abi-02.c @@ -1639,7 +1639,9 @@ build_v2_build_objc_method_call (int super_flag, tree method_prototype, fold_convert (rcv_p, integer_zero_node), 1); #ifdef OBJCPLUS - ret_val = build_conditional_expr (ifexp, ret_val, ftree, tf_warning_or_error); + ret_val = build_conditional_expr (input_location, + ifexp, ret_val, ftree, + tf_warning_or_error); #else /* ??? CHECKME. */ ret_val = build_conditional_expr (input_location, |