summaryrefslogtreecommitdiff
path: root/gcc/objc
diff options
context:
space:
mode:
authorPaolo Carlini <paolo.carlini@oracle.com>2013-05-22 09:14:46 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2013-05-22 09:14:46 +0000
commit5951f9dfd2f76609cd8f95177d2740416d753245 (patch)
treea68cc3fcc43337450658f348e9c51b5e33e75b5f /gcc/objc
parent88b1a025667aa121572beb7aa786646301719cf7 (diff)
downloadgcc-5951f9dfd2f76609cd8f95177d2740416d753245.tar.gz
objc-next-runtime-abi-02.c (build_v2_build_objc_method_call): Fix build_conditional_expr call.
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. From-SVN: r199187
Diffstat (limited to 'gcc/objc')
-rw-r--r--gcc/objc/ChangeLog5
-rw-r--r--gcc/objc/objc-next-runtime-abi-02.c4
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,